From 4e8823b584597d86d48d0aee7d864e804ce27344 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 11 Oct 2021 00:28:12 +0200 Subject: [PATCH] OCCT: port FreeCAD sources to version 7.6 --- src/Mod/Fem/App/FemConstraint.cpp | 12 ++++++++++-- src/Mod/Fem/App/FemConstraintFixed.cpp | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp index 18f72e87d2..8003fd6d79 100644 --- a/src/Mod/Fem/App/FemConstraint.cpp +++ b/src/Mod/Fem/App/FemConstraint.cpp @@ -36,8 +36,6 @@ # include # include # include -# include -# include # include # include # include @@ -51,6 +49,11 @@ # include # include # include +# include +# if OCC_VERSION_HEX < 0x070600 +# include +# include +# endif #endif #include "FemConstraint.h" @@ -74,6 +77,11 @@ double round(double r) { } #endif +#if OCC_VERSION_HEX >= 0x070600 +using Adaptor3d_HSurface = Adaptor3d_Surface; +using BRepAdaptor_HSurface = BRepAdaptor_Surface; +#endif + PROPERTY_SOURCE(Fem::Constraint, App::DocumentObject) Constraint::Constraint() diff --git a/src/Mod/Fem/App/FemConstraintFixed.cpp b/src/Mod/Fem/App/FemConstraintFixed.cpp index 4d80945490..5b8874ec90 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.cpp +++ b/src/Mod/Fem/App/FemConstraintFixed.cpp @@ -32,8 +32,6 @@ #include #include #include -#include -#include #include #include #include