From: jfa <jfa@opencascade.com>
Date: Mon, 27 May 2024 19:11:28 +0000 (+0100)
Subject: Fix compilation error (conflict of OK name between OCCT Plate_Plate.hxx and GEOM... 
X-Git-Tag: V9_13_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fbbd6a9e07c75cb4e57644a0cb27f7f3bc122d58;p=modules%2Fgeom.git

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

diff --git a/src/GEOMImpl/GEOMImpl_WrappingDriver.cxx b/src/GEOMImpl/GEOMImpl_WrappingDriver.cxx
index 3d3037fee..e89a3e62c 100644
--- a/src/GEOMImpl/GEOMImpl_WrappingDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_WrappingDriver.cxx
@@ -20,6 +20,15 @@
 // 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 <GEOMAlgo_Splitter.hxx>
@@ -44,11 +53,6 @@
 #include <Geom_Surface.hxx>
 #include <Geom_Plane.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_Sphere.hxx>
@@ -449,4 +453,4 @@ bool GEOMImpl_WrappingDriver::
   return true;
 }
 
-IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_WrappingDriver, GEOM_BaseDriver)
\ No newline at end of file
+IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_WrappingDriver, GEOM_BaseDriver)