Skip to content

Fix OpenCascade include

Edward Laughton requested to merge fix/OCCInclude into master

Issue/feature addressed

Superfluous include caused compilation errors on OCC versions 7.4 or newer

Proposed solution

Use the detected OCC version to decide whether the include is necessary or not

Implementation

#if OCC_VERSION_MAJOR < 7  || (OCC_VERSION_MAJOR == 7 && OCC_VERSION_MINOR < 4)
#include <GeomAdaptor_HSurface.hxx>
#endif

Tests

Notes

Please add any other information that could be useful for reviewers.

Checklist

  • Functions and classes, or changes to them, are documented.
  • User guide/documentation is updated.
  • Changelog is updated.
  • Suitable tests added for new functionality.
  • Contributed code is correctly formatted. (See the contributing guidelines).
  • License added to any new files.
  • No extraneous files have been added (e.g. compiler output or test data files).

Warning

On the 19.07 the code formatting (code style) was standardised using clang-format, over the whole Nektar++ code. This means changes in your branch will conflict with formatting changes on the master branch. To resolve these conflicts , see #295 (closed)

Edited by Edward Laughton

Merge request reports