From: eap <eap@opencascade.com>
Date: Fri, 21 Nov 2008 10:57:09 +0000 (+0000)
Subject:  0019957: EDF 785 SMESH: Convert Quadratic and Group on GEOM
X-Git-Tag: V5_1_0rc2~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=92a6856b9aff6fb97fa0e10548a9b76b887d2619;p=modules%2Fsmesh.git

 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 e003c9219..d00abe013 100644
--- 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 f23b601b7..94a6deb89 100644
--- 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(); }