From: Paul RASCLE <paul.rascle@edf.fr>
Date: Thu, 31 May 2018 09:44:51 +0000 (+0200)
Subject: portage V8_5_0
X-Git-Tag: HYDRO_V2_0_0~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6eed8444c3fc377ad0bf2fdd536ffc4657dad034;p=modules%2Fhydro.git

portage V8_5_0
---

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 873ba058..1200676a 100644
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -28,7 +28,7 @@
 #include <BOPAlgo_BOP.hxx>
 #include <BOPAlgo_Builder.hxx>
 #include <BOPAlgo_PaveFiller.hxx>
-#include <BOPCol_ListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
@@ -663,7 +663,7 @@ TopoDS_Shape HYDROData_LandCoverMap::MergeFaces( const TopTools_ListOfShape& the
   //DEBTRACE("MergeFaces");
   int anError;
   TopTools_ListIteratorOfListOfShape anIt;
-  BOPCol_ListOfShape aLC;
+  TopTools_ListOfShape aLC;
   anIt.Initialize(theFaces);
   for( ; anIt.More(); anIt.Next() )
   {
@@ -833,7 +833,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
   if( theNewShape.IsNull() )
     return false;
 
-  BOPCol_ListOfShape aShapesList;
+  TopTools_ListOfShape aShapesList;
   BOPAlgo_PaveFiller aPaveFiller;
   HYDROData_MapOfFaceToStricklerType aNewFaces;
 
diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index 488618de..94d57ea7 100644
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -322,7 +322,7 @@ HYDROData_SplitToZonesTool::SplitDataList
 
   // Step 1. Prepare Partition structures. 
   TopoDS_Shape aResult;
-  BOPCol_ListOfShape aLS;  
+  TopTools_ListOfShape aLS;  
   QStringList aListOfNames;
   TopoDS_Compound aCmp;
   BRep_Builder aBB;
@@ -365,7 +365,7 @@ HYDROData_SplitToZonesTool::SplitDataList
     
     // Step 3. Collect history  
     //HYDROData_DataMapOfShapeListOfShape aDM1;
-    BOPCol_ListIteratorOfListOfShape anIt(aLS); 
+    TopTools_ListIteratorOfListOfShape anIt(aLS); 
   #ifdef DEB_SPLIT_TO_ZONES
     TCollection_AsciiString aNamM ("EdgM_");
     TCollection_AsciiString aNamG ("EdgG_");
diff --git a/src/HYDROData/HYDROData_Transform.cxx b/src/HYDROData/HYDROData_Transform.cxx
index 69676bb8..5b01d0d4 100644
--- a/src/HYDROData/HYDROData_Transform.cxx
+++ b/src/HYDROData/HYDROData_Transform.cxx
@@ -30,10 +30,10 @@
 
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-#include <BOPCol_ListOfShape.hxx>
-#include <BOPCol_MapOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 
-#include <BOPCol_ListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
 
 #include <BOPAlgo_BuilderShape.hxx>
 #include <BOPAlgo_PaveFiller.hxx>
@@ -281,7 +281,7 @@ void HYDROData_Transform::BuildFuse()
 {
   Standard_Integer iErr;
   TopoDS_Iterator aIt;
-  BOPCol_ListOfShape aLC;
+  TopTools_ListOfShape aLC;
   BOPAlgo_PaveFiller aPF;
   //
   myErrorStatus=0;
diff --git a/src/HYDROData/HYDROData_Transform.h b/src/HYDROData/HYDROData_Transform.h
index 0b824a1f..bc897a9c 100644
--- a/src/HYDROData/HYDROData_Transform.h
+++ b/src/HYDROData/HYDROData_Transform.h
@@ -31,8 +31,8 @@
 
 #include <BRepBuilderAPI_Transform.hxx>
 
-#include <BOPCol_ListOfShape.hxx>
-#include <BOPCol_MapOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 
 #include <BOPAlgo_BuilderShape.hxx>
 #include <BOPAlgo_Builder.hxx>