Porting to OCCT dev version: update version 0x07010000 -> 0x07010001

diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
index a50bdc2047f80e5e743b181dad367927fe23ef9c..05636647b6251f12a405f9a7cda04110e2ac5896 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
@@ -225,7 +225,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid()
   aSB.SetContext(myContext);
   aSB.SetShapes(aSFS);
   aSB.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   iErr=aSB.HasErrors();
 #else
   iErr=aSB.ErrorStatus();

diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
index 85e51c440612e93ac31e4ec8c202676aad9a58f5..cb7f85322304c906e6fe03256d9de7f8d76c67db 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
@@ -111,7 +111,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   //
   // 1. CheckData
   CheckData();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -121,7 +121,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   //
   // 2. Prepare
   Prepare();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -132,7 +132,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   // 3. Fill Images
   // 3.1 Vertice
   FillImagesVertices();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -141,7 +141,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   }
   //
   BuildResult(TopAbs_VERTEX);
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -150,7 +150,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   }
   // 3.2 Edges
   FillImagesEdges();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -159,7 +159,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   }
   //
   BuildResult(TopAbs_EDGE);
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -169,7 +169,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   //
   // 3.3 Wires
   FillImagesContainers(TopAbs_WIRE);
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -178,7 +178,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   }
   //
   BuildResult(TopAbs_WIRE);
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -188,7 +188,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   
   // 3.4 Faces
   FillImagesFaces();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -197,7 +197,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
   }
   //
   BuildResult(TopAbs_FACE);
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (HasErrors()) {
 #else
   if (myErrorStatus) {
@@ -251,7 +251,7 @@ void GEOMAlgo_ShellSolid::Perform()
       myErrorStatus=10;
       return;
     }
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     if(myDSFiller->HasErrors()) {
 #else
     if(myDSFiller->ErrorStatus()) {
@@ -299,7 +299,7 @@ void GEOMAlgo_ShellSolid::Perform()
     GEOMAlgo_ShellSolidBuilder aSSB;
     //
     aSSB.PerformWithFiller(*myDSFiller);
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     iErr=aSSB.HasErrors();
 #else
     iErr=aSSB.ErrorStatus();

diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
index b39dce44ef59c37382c0770fb5d36167338b34b1..b7f49b6abf36174d76717fc9699f92d808be9abd 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
@@ -85,7 +85,7 @@ void GEOMAlgo_SolidSolid::Perform()
       myErrorStatus=10;
       return;
     }
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     if(myDSFiller->HasErrors()) {
 #else
     if(myDSFiller->ErrorStatus()) {

diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
index 182df0d41293af4b2902d1acd028040522295ede..b669f5cafd0516a269f29608c09f98cb87ea51d2 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
@@ -90,7 +90,7 @@ void GEOMAlgo_VertexSolid::Perform()
       myErrorStatus=10;
       return;
     }
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     if(myDSFiller->HasErrors()) {
 #else
     if(myDSFiller->ErrorStatus()) {

diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
index 1b87f5f32e25241c76e8332dd24d24168b6ef29d..8c44271a7fdc5d7f50e9fc8f439244b7e4a0a7f5 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
@@ -80,7 +80,7 @@ void GEOMAlgo_WireSolid::Perform()
       myErrorStatus=10;
       return;
     }
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     if(myDSFiller->HasErrors()) {
 #else
     if(myDSFiller->ErrorStatus()) {

diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
index 803c2e2ee590dfefea30185e69a1732f451d102f..3d03eff3f6443a3891d31c40eceff61815d4e53c 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
@@ -150,7 +150,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
           aList2.Append(aShape2);
           aCSI.SetArguments(aList1);
           aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
           if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
 #else
           if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
@@ -158,7 +158,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
             StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
           aCSI.SetArguments(aList2);
           aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
           if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
 #else
           if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
@@ -213,7 +213,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
             aList1.Append(aShape);
             aCSI.SetArguments(aList1);
             aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
             if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
 #else
             if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@@ -241,7 +241,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
               aList2.Append(aShape2);
               aCSI.SetArguments(aList2);
               aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
              if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
 #else
              if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@@ -286,7 +286,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
           aList1.Append(aShape);
           aCSI.SetArguments(aList1);
           aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
          if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
 #else
          if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@@ -320,7 +320,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
             aList2.Append(aTool);
             aCSI.SetArguments(aList2);
             aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
            if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
 #else
            if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {

diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index e7500023b42a29b24a46ffdd69a90c757b9b035a..ad2f75f9f174c21973ae341188ba90c14bdedbe2 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -1576,7 +1576,7 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersections
 
   // 1. Launch the checker
   aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   Standard_Boolean iErr = aCSI.HasErrors();
 #else
   Standard_Integer iErr = aCSI.ErrorStatus();

diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
index 5628babb7077cfee3a231813ff403c63c5043a6c..5a95d6ec4e19e0027177edff1d6db8d14482aa2c 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
@@ -44,7 +44,7 @@
 #include <Standard_NullObject.hxx>
 #include <StdFail_NotDone.hxx>
 #include <BOPAlgo_CheckerSI.hxx>
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
 #include <BOPAlgo_Alerts.hxx>
 #endif
 #include <BOPCol_IndexedDataMapOfShapeListOfShape.hxx>
@@ -109,7 +109,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape)
   aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
   aCSI.SetArguments(aList);
   aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
   if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
 #else
   if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@@ -417,7 +417,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const
   aShape = PS.Shape();
   if (aShape.IsNull()) {
     // Mantis issue 22009
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     if (PS.HasError(STANDARD_TYPE(BOPAlgo_AlertTooFewArguments)) && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1)
 #else
     if (PS.ErrorStatus() == 100 && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1)

diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
index 00ff9dde01c6b667e9828d95b174309fc976b6ee..13544e81bfc25a5ae45becd55f2c85da76ebe2a7 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
@@ -770,7 +770,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
     aMV.SetArguments(aLS);
     aMV.SetIntersect(aCI.GetIsIntersect());
     aMV.Perform();
-#if OCC_VERSION_LARGE > 0x07010000
+#if OCC_VERSION_LARGE > 0x07010001
     if (aMV.HasErrors()) return 0;
 #else
     if (aMV.ErrorStatus()) return 0;