From e0cf4ffd70857606afcac18249f5e745cddd1e29 Mon Sep 17 00:00:00 2001 From: Viktor UZLOV Date: Mon, 15 Feb 2021 12:08:35 +0300 Subject: [PATCH] fix errors after review --- idl/SMESH_Gen.idl | 2 +- src/SMESH_I/SMESH_Gen_i.cxx | 2 +- src/SMESH_I/SMESH_Gen_i.hxx | 4 ++-- src/SMESH_I/SMESH_Gen_i_1.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl index bc6b7fdaf..4e71c25d5 100644 --- 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 347e7938f..551f0b881 100644 --- 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 bad7a47e4..0d4f70108 100644 --- 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 diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 66f3e19bf..f5768f4b3 100644 --- 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 ) { -- 2.39.2