From b9b1bc96aa22fc9a300b286d86705f6409310887 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 11 Mar 2008 13:13:33 +0000 Subject: [PATCH] Avoid compilation problem because of using standard libraries --- src/GroupGUI/GroupGUI_GroupDlg.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 7c27bee9b..f40ff99d9 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -768,7 +768,7 @@ bool GroupGUI_GroupDlg::execute( ObjectList& objects ) SalomeApp_Study* study = getStudy(); if ( study ) { char* objIOR = GEOMBase::GetIORFromObject( aGroup ); - string IOR( objIOR ); + std::string IOR( objIOR ); free( objIOR ); if ( IOR != "" ) { _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 207a02905..44277ab71 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -470,7 +470,7 @@ void RepairGUI_GlueDlg::clearShapeBufferLocal( GEOM::GEOM_Object_ptr theObj ) return; _PTR(Study) aStudy = getStudy()->studyDS(); - _PTR(SObject) aSObj ( aStudy->FindObjectIOR( string( IOR.in() ) ) ); + _PTR(SObject) aSObj ( aStudy->FindObjectIOR( std::string( IOR.in() ) ) ); if ( !aSObj ) return; @@ -727,12 +727,12 @@ void RepairGUI_GlueDlg::ClickOnCancel() // Function : getEntry // Purpose : //================================================================ -static string getEntry( GEOM::GEOM_Object_ptr object ) +static std::string getEntry( GEOM::GEOM_Object_ptr object ) { SUIT_Session* session = SUIT_Session::session(); SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); if ( app ) { - string IOR = app->orb()->object_to_string( object ); + std::string IOR = app->orb()->object_to_string( object ); if ( IOR != "" ) { SalomeApp_Study* study = ( SalomeApp_Study* )app->activeStudy(); _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); -- 2.39.2