Merge V8_4_BR branch.

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

diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
index 7267317363b0cdfe0baa1a107240f0a7e0433e20..98981f651459b2787447145b106a8b9a67c63414 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -26,8 +26,6 @@
 #include <GEOMAlgo_RemoverWebs.hxx>
 #include <GEOMAlgo_ShapeAlgo.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
@@ -37,11 +35,7 @@
 
 #include <BRepClass3d_SolidClassifier.hxx>
 
-#if OCC_VERSION_LARGE > 0x06070100
 #include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
 
 #include <BOPAlgo_BuilderSolid.hxx>
 
@@ -108,11 +102,7 @@ void GEOMAlgo_RemoverWebs::Perform()
   if (!myContext.IsNull()) {
     myContext.Nullify();
   }
-#if OCC_VERSION_LARGE > 0x06070100
   myContext=new IntTools_Context;
-#else
-  myContext=new BOPInt_Context;
-#endif
   //
   BuildSolid();
   //
@@ -225,7 +215,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid()
   aSB.SetContext(myContext);
   aSB.SetShapes(aSFS);
   aSB.Perform();
-  iErr=aSB.ErrorStatus();
+  iErr=aSB.HasErrors();
   if (iErr) {
     myErrorStatus=20; // SolidBuilder failed
     return;
@@ -257,11 +247,7 @@ void GEOMAlgo_RemoverWebs::AddInternalShapes(const BOPCol_ListOfShape& aLSR,
   TopoDS_Solid aSd;
   BRep_Builder aBB;
   BOPCol_ListIteratorOfListOfShape aItLS;
-#if OCC_VERSION_LARGE > 0x06070100
   Handle(IntTools_Context) aCtx=new IntTools_Context;
-#else
-  Handle(BOPInt_Context) aCtx=new BOPInt_Context;
-#endif
   //
   aNbSI=aMSI.Extent();
   for (i=1; i<=aNbSI; ++i) {