Merge branch 'V9_5_BR'

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

diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
index 32ab2acefc22088cd6c3b705a1f441ead6c1da9b..a6e07b245f974d8c93351a88d04b82ca659f5a0f 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -90,7 +90,6 @@ GEOMAlgo_GlueDetector::GEOMAlgo_GlueDetector()
 //=======================================================================
 GEOMAlgo_GlueDetector::~GEOMAlgo_GlueDetector()
 {}
-//modified by NIZNHY-PKV Tue Mar 13 12:26:50 2012f
 //=======================================================================
 //function : StickedShapes
 //purpose  :
@@ -100,7 +99,6 @@ const TopTools_IndexedDataMapOfShapeListOfShape&
 {
   return myStickedShapes;
 }
-//modified by NIZNHY-PKV Tue Mar 13 12:26:54 2012t
 //=======================================================================
 //function : Perform
 //purpose  :
@@ -124,12 +122,10 @@ void GEOMAlgo_GlueDetector::Perform()
     return;
   }
   //
-  //modified by NIZNHY-PKV Wed Mar 14 08:00:09 2012f
   CheckDetected();
   if (myErrorStatus) {
     return;
   }
-  //modified by NIZNHY-PKV Wed Mar 14 08:00:12 2012t
   //
   DetectEdges();
   if (myErrorStatus) {
@@ -206,7 +202,7 @@ void GEOMAlgo_GlueDetector::DetectVertices()
     TColStd_MapIteratorOfMapOfInteger aIt1;
     //
     aMIP.Add(i);
-    while(1) {
+    for(;;) {
       aNbIP=aMIP.Extent();
       aIt1.Initialize(aMIP);
       for(; aIt1.More(); aIt1.Next()) {
@@ -223,7 +219,7 @@ void GEOMAlgo_GlueDetector::DetectVertices()
         //
         aNbVSD=aBBTree.Select(aSelector);
         if (!aNbVSD) {
-          continue;  // it shoild not be so [at least IP itself]
+          continue;  // it should not be so [at least IP itself]
         }
         //
         const TColStd_ListOfInteger& aLI=aSelector.Indices();
@@ -460,7 +456,6 @@ void GEOMAlgo_GlueDetector::EdgePassKey(const TopoDS_Edge& aE,
   //
   aPK.SetShapes(aLV);
 }
-//modified by NIZNHY-PKV Tue Mar 13 09:54:18 2012f
 //=======================================================================
 //function : CheckDetected
 //purpose  :
@@ -551,7 +546,7 @@ Standard_Integer CheckAncesstors
    const TopTools_IndexedDataMapOfShapeListOfShape& aMEV,
    TopTools_IndexedDataMapOfShapeListOfShape& aMEVZ)
 {
-  Standard_Address pLE, pLV, pLVZ;
+  TopTools_ListOfShape *pLE, *pLV, *pLVZ;
   Standard_Integer iRet, aNbVX;
   TopTools_ListIteratorOfListOfShape aItLE, aItLV;
   TopTools_MapOfShape aMFence;
@@ -559,24 +554,20 @@ Standard_Integer CheckAncesstors
   //
   iRet=0;
   //
-  pLE=aMVE.FindFromKey1(aVSD);
+  pLE=const_cast<TopTools_IndexedDataMapOfShapeListOfShape&>(aMVE).ChangeSeek(aVSD);
   if (!pLE) {
     return iRet;
   }
-  //
-  const TopTools_ListOfShape& aLE=*((TopTools_ListOfShape*)pLE);
-  aItLE.Initialize(aLE);
+  aItLE.Initialize(*pLE);
   for (; aItLE.More(); aItLE.Next()) {
     const TopoDS_Shape& aE=aItLE.Value();
     //
-    pLV=aMEV.FindFromKey1(aE);
+    pLV=const_cast<TopTools_IndexedDataMapOfShapeListOfShape&>(aMEV).ChangeSeek(aE);
     if (!pLV) {
       continue; // it should be not so
     }
-    //
     aLVX.Clear();
-    const TopTools_ListOfShape& aLV=*((TopTools_ListOfShape*)pLV);
-    aItLV.Initialize(aLV);
+    aItLV.Initialize(*pLV);
     for (; aItLV.More(); aItLV.Next()) {
       const TopoDS_Shape& aV=aItLV.Value();
       if (!aV.IsSame(aVSD)) {
@@ -595,16 +586,15 @@ Standard_Integer CheckAncesstors
     //
     iRet=1;
     //
-    pLVZ=aMEVZ.FindFromKey1(aE);
+    pLVZ=aMEVZ.ChangeSeek(aE);
     if (!pLVZ) {
       aMEVZ.Add(aE, aLVX);
     }
     else {
-      TopTools_ListOfShape& aLVZ=*((TopTools_ListOfShape*)pLVZ);
+      TopTools_ListOfShape& aLVZ=*pLVZ;
       aLVZ.Append(aLVX);
     }
   }
   //
   return iRet;
 }
-//modified by NIZNHY-PKV Tue Mar 13 09:54:59 2012t