ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-25 17:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation error (conflict of OK name between OCCT Plate_Plate.hxx and GEOM GEOM_IOperations.hxx)

Browse Source
This commit is contained in:
jfa 2024-05-27 20:11:28 +01:00
parent 5e34fe0812
commit fbbd6a9e07
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GEOMImpl/GEOMImpl_WrappingDriver.cxx
View File

@ -20,6 +20,15 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// These GeomPlate_* headers must be included before Salome ones
// because of conflicting OK variable/constant between
// OCCT Plate_Plate.hxx and GEOM GEOM_IOperations.hxx
#include <GeomPlate_Surface.hxx>
#include <GeomPlate_BuildPlateSurface.hxx>
#include <GeomPlate_PointConstraint.hxx>
#include <GeomPlate_MakeApprox.hxx>
#include <GeomPlate_BuildAveragePlane.hxx>
#include <GEOMImpl_WrappingDriver.hxx> #include <GEOMImpl_WrappingDriver.hxx>
#include <GEOMAlgo_Splitter.hxx> #include <GEOMAlgo_Splitter.hxx>
@ -44,11 +53,6 @@
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <Geom_Plane.hxx> #include <Geom_Plane.hxx>
#include <Geom_BSplineSurface.hxx> #include <Geom_BSplineSurface.hxx>
#include <GeomPlate_Surface.hxx>
#include <GeomPlate_BuildPlateSurface.hxx>
#include <GeomPlate_PointConstraint.hxx>
#include <GeomPlate_MakeApprox.hxx>
#include <GeomPlate_BuildAveragePlane.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Sphere.hxx> #include <gp_Sphere.hxx>
@ -449,4 +453,4 @@ bool GEOMImpl_WrappingDriver::
return true; return true;
} }
IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_WrappingDriver, GEOM_BaseDriver) IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_WrappingDriver, GEOM_BaseDriver)