From e98ad67e3dfcd8e40eab49472663f4dbd188f2f9 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 28 Apr 2010 07:12:16 +0000 Subject: [PATCH] 0020729: EDF 1256 GEOM : Partition between 2 contact surfaces Additional patch to fix unstable behavior (include Standard_Version.hxx explicitly) --- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 #include #include @@ -56,9 +57,9 @@ #include // 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