0021672: [CEA 565] Dump Study from script

[modules/geom.git] / src / NMTTools / NMTTools_PaveFiller_2.cxx

diff --git a/src/NMTTools/NMTTools_PaveFiller_2.cxx b/src/NMTTools/NMTTools_PaveFiller_2.cxx
index 8a33ae732a57f657c0e77536b977b3d683601057..be0cbe7282d89b8f64543832d65929978f617626 100644 (file)
--- a/src/NMTTools/NMTTools_PaveFiller_2.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,15 +20,15 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  File:        NMTTools_PaveFiller_2.cxx
-//  Created:     Mon Dec  8 12:02:56 2003
-//  Author:      Peter KURNEV
-//               <pkv@irinox>
-//
+// File:        NMTTools_PaveFiller_2.cxx
+// Created:     Mon Dec  8 12:02:56 2003
+// Author:      Peter KURNEV
 
 #include <Standard_Version.hxx>
 
-#include <NMTTools_PaveFiller.ixx>
+#include <NMTTools_PaveFiller.hxx>
+
+#include <Basics_OCCTVersion.hxx>
 
 #include <Precision.hxx>
 
@@ -57,23 +57,16 @@
 #include <NMTDS_ShapesDataStructure.hxx>
 #include <NMTDS_InterfPool.hxx>
 
-// Modified  Thu Sep 14 14:35:18 2006
-// Contribution of Samtech www.samcef.com BEGIN
+
 #include <BOPTools_IndexedMapOfCoupleOfInteger.hxx>
 #include <BOPTools_CoupleOfInteger.hxx>
 #include <BooleanOperations_OnceExplorer.hxx>
 
+#include <IntTools_Context.hxx>
+
 static
   Standard_Boolean Contains(const TopoDS_Edge& aE,
                             const TopoDS_Vertex& aV);
-// Contribution of Samtech www.samcef.com END
-
-// In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
-#ifdef OCC_VERSION_SERVICEPACK
-#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
 
 //=======================================================================
 // function: PerformVE
@@ -88,6 +81,7 @@ void NMTTools_PaveFiller::PerformVE()
   Standard_Integer aWith, aNbVEs, aBlockLength, iSDV, nV1;
   Standard_Real aT;
 #if OCC_VERSION_LARGE > 0x06030008
+  // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
   Standard_Boolean bToUpdateVertex;
   Standard_Real aDist;
 #endif
@@ -162,9 +156,10 @@ void NMTTools_PaveFiller::PerformVE()
       //
       //modified by NIZNHY-PKV Mon Dec 28 08:58:05 2009f
 #if OCC_VERSION_LARGE > 0x06030008
-      aFlag=myContext.ComputeVE (aV1, aE2, aT, bToUpdateVertex, aDist);
+      // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
+      aFlag = myContext->ComputeVE (aV1, aE2, aT, bToUpdateVertex, aDist);
 #else
-      aFlag=myContext.ComputeVE (aV1, aE2, aT);
+      aFlag = myContext->ComputeVE (aV1, aE2, aT);
 #endif
       //modified by NIZNHY-PKV Mon Dec 28 08:58:13 2009t
       //
@@ -194,6 +189,7 @@ void NMTTools_PaveFiller::PerformVE()
         //
         //modified by NIZNHY-PKV Mon Dec 28 09:00:54 2009f
 #if OCC_VERSION_LARGE > 0x06030008
+        // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
         if (bToUpdateVertex) {
           BRep_Builder aBB;
           //