fix errors after review

diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl
index bc6b7fdaf51b3708006ddcde435175e8d07ef2a4..4e71c25d5743176b4f7cb914442ae7ff38cd9eec 100644 (file)
--- a/idl/SMESH_Gen.idl
+++ b/idl/SMESH_Gen.idl
@@ -463,7 +463,7 @@ module SMESH
      *
      * Can be used to check if the object was created in the same container, as this engine.
      */
-    smIdType GetObjectId(in Object theObject);
+    long GetObjectId(in Object theObject);
 
     /*!
      * \brief Get version of MED format being used.

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 347e7938fb195a3403139db4d5fe24b677cd1711..551f0b881b421bcce0ba712ecd7732c495fc5e85 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -6247,7 +6247,7 @@ int SMESH_Gen_i::RegisterObject(CORBA::Object_ptr theObject)
  */
 //================================================================================
 
-SMESH::smIdType  SMESH_Gen_i::GetObjectId(CORBA::Object_ptr theObject)
+CORBA::Long  SMESH_Gen_i::GetObjectId(CORBA::Object_ptr theObject)
 {
   if ( myStudyContext && !CORBA::is_nil( theObject )) {
     string iorString = GetORB()->object_to_string( theObject );

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index bad7a47e46c28d09104549b61d2567d7c3d83906..0d4f7010889f1dfd43520fe6d9583153a6df67b9 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -71,7 +71,7 @@ public:
   // register object in the internal map and return its id
   int         addObject( const std::string& theIOR );
   // find the object id in the internal map by the IOR
-  smIdType    findId( const std::string& theIOR );
+  int         findId( const std::string& theIOR );
   // get object's IOR by id
   std::string getIORbyId( const int theId );
   // get object's IOR by old id
@@ -537,7 +537,7 @@ public:
   int RegisterObject(CORBA::Object_ptr theObject);
 
   // Return id of registered object
-  SMESH::smIdType GetObjectId(CORBA::Object_ptr theObject);
+  CORBA::Long GetObjectId(CORBA::Object_ptr theObject);
 
   // Return an object that previously had an oldID
   template<class TInterface>

diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 66f3e19bfd3cf83fd9cb5ce2aa825f7c31ca10cb..f5768f4b3c6405efe5b0f706d2502166fde99673 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -1537,7 +1537,7 @@ int StudyContext::addObject( const std::string& theIOR )
 //purpose  : find the object id in the internal map by the IOR
 //=======================================================================
 
-smIdType StudyContext::findId( const std::string& theIOR )
+int StudyContext::findId( const std::string& theIOR )
 {
   TInt2StringMap::iterator imap;
   for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) {