updated copyright message

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_WireSolid.cxx

diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 958d427..e827c16
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,8 +27,6 @@
 //
 #include <GEOMAlgo_WireSolid.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <Standard_Failure.hxx>
 
 #include <TopAbs_ShapeEnum.hxx>
@@ -40,17 +38,11 @@
 #include <BOPDS_ListOfPaveBlock.hxx>
 #include <BOPDS_PaveBlock.hxx>
 #include <TopoDS_Solid.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
 #include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRep_Tool.hxx>
 #include <BOPTools_AlgoTools.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 //=======================================================================
 //function : GEOMAlgo_WireSolid
 //purpose  :
@@ -80,7 +72,7 @@ void GEOMAlgo_WireSolid::Perform()
       myErrorStatus=10;
       return;
     }
-    if(myDSFiller->ErrorStatus()) {
+    if(myDSFiller->HasErrors()) {
       myErrorStatus=11;
       return;
     }
@@ -88,7 +80,7 @@ void GEOMAlgo_WireSolid::Perform()
     Standard_Integer aNbArgs;
     //
     const BOPDS_DS& aDS=myDSFiller->DS();
-    const BOPCol_ListOfShape& aLS=aDS.Arguments();
+    const TopTools_ListOfShape& aLS=aDS.Arguments();
     aNbArgs=aLS.Extent();
     if (!aNbArgs) {
       myErrorStatus=13;
@@ -98,7 +90,7 @@ void GEOMAlgo_WireSolid::Perform()
     BuildResult();
   }
   //
-  catch (Standard_Failure) {
+  catch (Standard_Failure&) {
     myErrorStatus= 12;
   }
 }
@@ -123,7 +115,7 @@ void GEOMAlgo_WireSolid::BuildResult()
   const BOPDS_DS& aDS=myDSFiller->DS();
   BOPDS_DS* pDS=(BOPDS_DS*)&aDS;
   //
-  const BOPCol_ListOfShape& aLS=pDS->Arguments();
+  const TopTools_ListOfShape& aLS=pDS->Arguments();
   aNbArgs=aLS.Extent();
   if (aNbArgs!=2) {
     myErrorStatus=14;
@@ -150,11 +142,7 @@ void GEOMAlgo_WireSolid::BuildResult()
   const TopoDS_Solid& aSolid=(iRank==0) ?  *((TopoDS_Solid*)&aTool) :
     *((TopoDS_Solid*)&aObj);
   //
-#if OCC_VERSION_LARGE > 0x06070100
   Handle(IntTools_Context) aCtx=myDSFiller->Context();
-#else
-  Handle(BOPInt_Context) aCtx=myDSFiller->Context();
-#endif
   //BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
   //
   const BOPDS_IndexRange& aRange=pDS->Range(iRank);
@@ -186,11 +174,7 @@ void GEOMAlgo_WireSolid::BuildResult()
     }
     else if (aNbPB==1) {
       const Handle(BOPDS_PaveBlock)& aPB=aLPB.First();
-#if OCC_VERSION_LARGE > 0x06060000 // Porting to OCCT higher 6.6.0 version
       if (pDS->IsCommonBlock(aPB)) {
-#else
-      if (aPB->IsCommonBlock()) {
-#endif
        aState=TopAbs_ON;
       }
       else{