Update of last version

diff --git a/src/ChFi3d/ChFi3d_Builder.cxx b/src/ChFi3d/ChFi3d_Builder.cxx
index a70a4dab2eb6dc18e7401668140472b81bbc4686..c0cfa48e32d57cfe24c34cca8da9a71105b6c7ea 100644 (file)
--- a/src/ChFi3d/ChFi3d_Builder.cxx
+++ b/src/ChFi3d/ChFi3d_Builder.cxx
@@ -81,7 +81,7 @@
 #include <TopOpeBRepDS_PointIterator.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <BOPCol_MapOfOrientedShape.hxx>
+#include <TopTools_MapOfOrientedShape.hxx>
 
 #ifdef OCCT_DEBUG
 #include <OSD_Chronometer.hxx>
@@ -129,7 +129,7 @@ TopoDS_Wire BuildNewWire(const TopoDS_Wire& theWire,
   TopoDS_Edge   StartEdge, SecondEdge;
   Standard_Real MinDist = RealLast();
   TopTools_ListIteratorOfListOfShape itl;
-  BOPCol_MapOfOrientedShape Emap;
+  TopTools_MapOfOrientedShape Emap;
   for (Standard_Integer i = 1; i <= OldVertices.Extent(); i++)
   {
     TopoDS_Vertex aVertex = TopoDS::Vertex(OldVertices(i));
@@ -621,7 +621,8 @@ void  ChFi3d_Builder::Compute()
         GenFuse.Perform();
         TopoDS_Shape aNewFace = aFace.EmptyCopied();
         const TopoDS_Shape& aResFuse = GenFuse.Shape();
-        const BOPCol_DataMapOfShapeListOfShape& ModifiedShapes = GenFuse.Images();
+        //const BOPCol_DataMapOfShapeListOfShape& ModifiedShapes = GenFuse.Images();
+        const TopTools_DataMapOfShapeListOfShape& ModifiedShapes = GenFuse.Images();
         TopTools_IndexedDataMapOfShapeListOfShape VEmapOfNewFace;
         TopExp::MapShapesAndAncestors(aResFuse, TopAbs_VERTEX, TopAbs_EDGE, VEmapOfNewFace);
         TopoDS_Iterator itw(aFace);

diff --git a/src/ChFiDS/ChFiDS_SurfData.hxx b/src/ChFiDS/ChFiDS_SurfData.hxx
index 57b00e7899f69c94274a70efc39a58670dd7a236..d8976c1487251d7932c9cf976056c3ce2c1ef682 100644 (file)
--- a/src/ChFiDS/ChFiDS_SurfData.hxx
+++ b/src/ChFiDS/ChFiDS_SurfData.hxx
@@ -27,19 +27,19 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopAbs_Orientation.hxx>
-#include <MMgt_TShared.hxx>
-class MMgt_TShared;
+#include <Standard_Transient.hxx>
+
 class ChFiDS_FaceInterference;
 class ChFiDS_CommonPoint;
 class gp_Pnt2d;
 
 
 class ChFiDS_SurfData;
-DEFINE_STANDARD_HANDLE(ChFiDS_SurfData, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(ChFiDS_SurfData, Standard_Transient)
 
 //! data structure for all information related to  the
 //! fillet and to 2 faces vis a vis
-class ChFiDS_SurfData : public MMgt_TShared
+class ChFiDS_SurfData : public Standard_Transient
 {
 
 public:
@@ -141,9 +141,9 @@ public:
   
   Standard_EXPORT void LastExtensionValue (const Standard_Real Extend);
   
-  Standard_EXPORT Handle(MMgt_TShared) Simul() const;
+  Standard_EXPORT Handle(Standard_Transient) Simul() const;
   
-  Standard_EXPORT void SetSimul (const Handle(MMgt_TShared)& S);
+  Standard_EXPORT void SetSimul (const Handle(Standard_Transient)& S);
   
   Standard_EXPORT void ResetSimul();
   
@@ -164,7 +164,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(ChFiDS_SurfData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ChFiDS_SurfData,Standard_Transient)
 
 protected:
 
@@ -188,8 +188,7 @@ private:
   Standard_Real ulspine;
   Standard_Real myfirstextend;
   Standard_Real mylastextend;
-  Handle(MMgt_TShared) simul;
-  
+  Handle(Standard_Transient) simul;
   Standard_Integer indexOfS1;
   Standard_Integer indexOfC1;
   Standard_Integer indexOfS2;