From: vsr <vsr@opencascade.com>
Date: Wed, 28 Apr 2010 07:12:16 +0000 (+0000)
Subject: 0020729: EDF 1256 GEOM : Partition between 2 contact surfaces
X-Git-Tag: V5_1_4rc1~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e98ad67e3dfcd8e40eab49472663f4dbd188f2f9;p=modules%2Fgeom.git

0020729: EDF 1256 GEOM : Partition between 2 contact surfaces
Additional patch to fix unstable behavior (include Standard_Version.hxx explicitly)
---

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index febf42a76..d78c82d4e 100644
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -24,6 +24,7 @@
 #pragma warning( disable:4786 )
 #endif
 
+#include <Standard_Version.hxx>
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IHealingOperations.hxx>
@@ -56,9 +57,9 @@
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
 #ifdef OCC_VERSION_SERVICEPACK
-#if (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK) > 0x06030008
-#define OCCT_6_3_0_sp_9
-#endif
+#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK)
+#else
+#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8)
 #endif
 
 
@@ -737,7 +738,7 @@ bool GEOMImpl_IHealingOperations::GetFreeBoundary (Handle(GEOM_Object) theObject
 
   // get free boundary shapes
 
-#ifdef OCCT_6_3_0_sp_9
+#if OCC_VERSION_LARGE > 0x06030008
   ShapeAnalysis_FreeBounds anAnalizer(aShape, Standard_False,
                                       Standard_True, Standard_True);
 #else