Merge branch 'V8_4_BR'

[modules/smesh.git] / src / SMESH_I / SMESH_Gen_i.hxx

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index ef9842298be0176a71615b15ce8fc52cea1a5778..7f3765e8da804950228a2ccc700adb6dda331a9a 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -117,10 +117,7 @@ private:
   // get next free object identifier
   int getNextId()
   {
-    int id = 1;
-    while( mapIdToIOR.IsBound( id ) )
-      id++;
-    return id;
+    return mapIdToIOR.Extent() + 1;
   }
 
   TInt2StringMap mapIdToIOR; // persistent-to-transient map
@@ -154,9 +151,9 @@ public:
   // Get the SALOMEDS::SObject corresponding to a CORBA object
   static SALOMEDS::SObject_ptr ObjectToSObject(SALOMEDS::Study_ptr theStudy,
                                                CORBA::Object_ptr   theObject);
-  // Get GEOM Object correspoding to TopoDS_Shape
+  // Get GEOM Object corresponding to TopoDS_Shape
   GEOM::GEOM_Object_ptr ShapeToGeomObject (const TopoDS_Shape& theShape );
-  // Get TopoDS_Shape correspoding to GEOM_Object
+  // Get TopoDS_Shape corresponding to GEOM_Object
   TopoDS_Shape GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject);
 
   // Default constructor
@@ -321,7 +318,7 @@ public:
                                         SMESH::long_array&    theShapesId )
     throw ( SALOME::SALOME_Exception );
 
-  // Returns errors of hypotheses definintion
+  // Returns errors of hypotheses definition
   SMESH::algo_error_array* GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh,
                                          GEOM::GEOM_Object_ptr theSubObject )
       throw ( SALOME::SALOME_Exception );