ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-28 00:45:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

Additional patch for 0020603 to fix unstable behavior (bring Standard_Version.hxx to the top and change #ifdef clause)

Browse Source
This commit is contained in:
vsr 2010-04-28 07:14:35 +00:00
parent e98ad67e3d
commit 985cdef248
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/NMTTools/NMTTools_PaveFiller_2.cxx
View File

@ -25,6 +25,9 @@
// Author: Peter KURNEV // Author: Peter KURNEV
// <pkv@irinox> // <pkv@irinox>
// //
#include <Standard_Version.hxx>
#include <NMTTools_PaveFiller.ixx> #include <NMTTools_PaveFiller.ixx>
#include <Precision.hxx> #include <Precision.hxx>
@ -54,8 +57,6 @@
#include <NMTDS_ShapesDataStructure.hxx> #include <NMTDS_ShapesDataStructure.hxx>
#include <NMTDS_InterfPool.hxx> #include <NMTDS_InterfPool.hxx>
#include <Standard_Version.hxx>
// Modified Thu Sep 14 14:35:18 2006 // Modified Thu Sep 14 14:35:18 2006
// Contribution of Samtech www.samcef.com BEGIN // Contribution of Samtech www.samcef.com BEGIN
#include <BOPTools_IndexedMapOfCoupleOfInteger.hxx> #include <BOPTools_IndexedMapOfCoupleOfInteger.hxx>
@ -69,9 +70,9 @@ static
// In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
#ifdef OCC_VERSION_SERVICEPACK #ifdef OCC_VERSION_SERVICEPACK
#if (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK) > 0x06030008 #define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK)
#define OCCT_6_3_0_sp_9 #else
#endif #define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8)
#endif #endif
//======================================================================= //=======================================================================
@ -86,7 +87,7 @@ void NMTTools_PaveFiller::PerformVE()
Standard_Integer n1, n2, anIndexIn, aFlag, aWhat; Standard_Integer n1, n2, anIndexIn, aFlag, aWhat;
Standard_Integer aWith, aNbVEs, aBlockLength, iSDV, nV1; Standard_Integer aWith, aNbVEs, aBlockLength, iSDV, nV1;
Standard_Real aT; Standard_Real aT;
#ifdef OCCT_6_3_0_sp_9 #if OCC_VERSION_LARGE > 0x06030008
Standard_Boolean bToUpdateVertex; Standard_Boolean bToUpdateVertex;
Standard_Real aDist; Standard_Real aDist;
#endif #endif
@ -160,7 +161,7 @@ void NMTTools_PaveFiller::PerformVE()
} }
// //
//modified by NIZNHY-PKV Mon Dec 28 08:58:05 2009f //modified by NIZNHY-PKV Mon Dec 28 08:58:05 2009f
#ifdef OCCT_6_3_0_sp_9 #if OCC_VERSION_LARGE > 0x06030008
aFlag=myContext.ComputeVE (aV1, aE2, aT, bToUpdateVertex, aDist); aFlag=myContext.ComputeVE (aV1, aE2, aT, bToUpdateVertex, aDist);
#else #else
aFlag=myContext.ComputeVE (aV1, aE2, aT); aFlag=myContext.ComputeVE (aV1, aE2, aT);
@ -192,7 +193,7 @@ void NMTTools_PaveFiller::PerformVE()
myIP->Add(aWhat, aWith, Standard_True, NMTDS_TI_VE); myIP->Add(aWhat, aWith, Standard_True, NMTDS_TI_VE);
// //
//modified by NIZNHY-PKV Mon Dec 28 09:00:54 2009f //modified by NIZNHY-PKV Mon Dec 28 09:00:54 2009f
#ifdef OCCT_6_3_0_sp_9 #if OCC_VERSION_LARGE > 0x06030008
if (bToUpdateVertex) { if (bToUpdateVertex) {
BRep_Builder aBB; BRep_Builder aBB;
// //