0019957: EDF 785 SMESH: Convert Quadratic and Group on GEOM

    return bool from Remove()

diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx
index e003c9219d25d559edd4428937abfaaaa8785eb7..d00abe01361c6b157bcf924815b7cf6eff1950e7 100644 (file)
--- a/src/SMDS/SMDS_MeshGroup.cxx
+++ b/src/SMDS/SMDS_MeshGroup.cxx
@@ -137,10 +137,15 @@ void SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem)
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshGroup::Remove(const SMDS_MeshElement * theElem)
+bool SMDS_MeshGroup::Remove(const SMDS_MeshElement * theElem)
 {
-       myElements.erase(theElem);
-       if (myElements.empty()) myType = SMDSAbs_All;
+  TIterator found = myElements.find(theElem);
+  if ( found != myElements.end() ) {
+    myElements.erase(found);
+    if (myElements.empty()) myType = SMDSAbs_All;
+    return true;
+  }
+  return false;
 }
 
 //=======================================================================

diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx
index f23b601b7a48d1e4fdd9dfe369cfd9872aa62e28..94a6deb891e30bd54d5b6100824263072b843d46 100644 (file)
--- a/src/SMDS/SMDS_MeshGroup.hxx
+++ b/src/SMDS/SMDS_MeshGroup.hxx
@@ -46,7 +46,7 @@ class SMDS_EXPORT SMDS_MeshGroup:public SMDS_MeshObject
         void SetType (const SMDSAbs_ElementType theType);
         void Clear();
        void Add(const SMDS_MeshElement * theElem);
-       void Remove(const SMDS_MeshElement * theElem);
+       bool Remove(const SMDS_MeshElement * theElem);
        bool IsEmpty() const { return myElements.empty(); }
        int Extent() const { return myElements.size(); }