From: akl <akl@opencascade.com>
Date: Tue, 27 Mar 2007 09:28:39 +0000 (+0000)
Subject: IPAL15344 (SMESH_MeshEditor.idl: signature of MergeEqualElements() was changed):
X-Git-Tag: V3_2_6pre3~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cb6055fef4b768ef39895aa0226a5e055ca8fe31;p=modules%2Fsmesh.git

IPAL15344 (SMESH_MeshEditor.idl: signature of MergeEqualElements() was changed):
	restore MergeEqualElements() signature.
---

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 06e6981ee..6461586bd 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -1319,10 +1319,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Concatenate(const SMESH::mesh_array& theMeshe
 	aNewEditor.FindCoincidentNodes( aMeshNodes, theMergeTolerance, aGroupsOfNodes );
 	aNewEditor.MergeNodes( aGroupsOfNodes );
 	// merge elements
-	set<const SMDS_MeshElement*> aMeshElements; // no input elements
-	SMESH_MeshEditor::TListOfListOfElementsID aGroupsOfElementsID;
-	aNewEditor.FindEqualElements(aMeshElements, aGroupsOfElementsID);
-	aNewEditor.MergeEqualElements(aGroupsOfElementsID);
+	aNewEditor.MergeEqualElements();
       }
     }
   }