From: vsr <vsr@opencascade.com>
Date: Tue, 11 Mar 2008 09:53:47 +0000 (+0000)
Subject: Avoid compilation problem because of using standard libraries
X-Git-Tag: V5_0_0a1~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b5d171ec2299b5891ddbafa232f7a1757fbb7b9e;p=modules%2Fgeom.git

Avoid compilation problem because of using standard libraries
---

diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx
index eb60430f6..0f7d30cfb 100644
--- a/src/GEOMBase/GEOMBase.cxx
+++ b/src/GEOMBase/GEOMBase.cxx
@@ -913,7 +913,7 @@ QString GEOMBase::GetName( GEOM::GEOM_Object_ptr theObj )
     CORBA::String_var anIOR = SalomeApp_Application::orb()->object_to_string( theObj );
     if ( strcmp(anIOR.in(), "") != 0 )
     {
-      _PTR(SObject) aSObj ( appStudy->studyDS()->FindObjectIOR( string( anIOR ) ) );
+      _PTR(SObject) aSObj ( appStudy->studyDS()->FindObjectIOR( std::string( anIOR ) ) );
 
       _PTR(GenericAttribute) anAttr;
 
diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 57a4d102f..73d1a04be 100755
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -162,7 +162,7 @@ void GEOMBase_Helper::erase( const ObjectList& objList, const bool updateView )
 void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView )
 {
   if ( !object->_is_nil() ) {
-    string entry = getEntry( object );
+    std::string entry = getEntry( object );
     getDisplayer()->Erase( new SALOME_InteractiveObject(
       entry.c_str(), "GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView );
   }
@@ -201,7 +201,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
     // Enable activisation of selection
     getDisplayer()->SetToActivate( true );
 
-    string entry = getEntry( object );
+    std::string entry = getEntry( object );
     getDisplayer()->Redisplay(new SALOME_InteractiveObject
                               (entry.c_str(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false);
   }
@@ -211,7 +211,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
     if ( aDoc && aDoc->studyDS() ) {
       _PTR(Study) aStudy = aDoc->studyDS();
       CORBA::String_var objStr = SalomeApp_Application::orb()->object_to_string(object);
-      _PTR(SObject) aSObj (aStudy->FindObjectIOR(string(objStr.in())));
+      _PTR(SObject) aSObj (aStudy->FindObjectIOR(std::string(objStr.in())));
       if ( aSObj  ) {
 	_PTR(ChildIterator) anIt ( aStudy->NewChildIterator( aSObj ) );
 	for ( anIt->InitEx( true ); anIt->More(); anIt->Next() ) {
@@ -219,7 +219,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
             (GeometryGUI::ClientSObjectToObject(anIt->Value()));
 	  if ( !CORBA::is_nil( aChild ) ) {
 	    if ( !aChild->_is_nil() ) {
-	      string entry = getEntry( aChild );
+	      std::string entry = getEntry( aChild );
 	      getDisplayer()->Redisplay( new SALOME_InteractiveObject(
                 entry.c_str(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false );
 	    }
@@ -440,7 +440,7 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const int theMo
     GEOM::GEOM_Object_ptr anObj = *anIter;
     if ( anObj->_is_nil() )
       continue;
-    string aEntry = getEntry( anObj );
+    std::string aEntry = getEntry( anObj );
     if ( aEntry != "" )
       aListOfIO.Append( new SALOME_InteractiveObject(
         aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ).toLatin1().constData() ) ) );
@@ -579,7 +579,7 @@ char* GEOMBase_Helper::getEntry( GEOM::GEOM_Object_ptr object ) const
   SalomeApp_Study* study = getStudy();
   if ( study )  {
     char * objIOR = GEOMBase::GetIORFromObject( object );
-    string IOR( objIOR );
+    std::string IOR( objIOR );
     free( objIOR );
     if ( IOR != "" ) {
       _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
@@ -619,7 +619,7 @@ void GEOMBase_Helper::clearShapeBuffer( GEOM::GEOM_Object_ptr theObj )
     return;
 
   _PTR(Study) aStudy = getStudy()->studyDS();
-  _PTR(SObject) aSObj ( aStudy->FindObjectIOR( string( IOR ) ) );
+  _PTR(SObject) aSObj ( aStudy->FindObjectIOR( std::string( IOR ) ) );
   if ( !aSObj )
     return;
 
@@ -1003,7 +1003,7 @@ bool GEOMBase_Helper::selectObjects( ObjectList& objects )
   ObjectList::iterator anIter;
   for ( anIter = objects.begin(); anIter != objects.end(); ++anIter )
   {
-    string entry = getEntry( *anIter );
+    std::string entry = getEntry( *anIter );
     QString aEntry( entry.c_str() );
     LightApp_DataOwner* anOwher = new LightApp_DataOwner( aEntry );
     aList.append( anOwher );
@@ -1034,7 +1034,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather( GEOM::GEOM_Object_ptr
     dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
   _PTR(Study) aDStudy = appStudy->studyDS();
-  string IOR = GEOMBase::GetIORFromObject( theFather );
+  std::string IOR = GEOMBase::GetIORFromObject( theFather );
   _PTR(SObject) SObj ( aDStudy->FindObjectIOR( IOR ) );
 
   bool inStudy = false;
diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index befc7adcd..c6e623ea9 100644
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -176,7 +176,7 @@ protected:
 protected:
   Handle(SALOME_InteractiveObject) myIO;
   TopoDS_Shape                     myShape;
-  string                           myName;
+  std::string                      myName;
   int                              myType;
   SALOME_View*                     myViewFrame;