From 7a2ad46e4ce00680f42a925dda07a74018a659c9 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 6 Mar 2008 14:24:31 +0000 Subject: [PATCH] Fix pb with standard libraries --- src/GEOM/GEOM_Engine.cxx | 6 +++--- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index ec1a8a660..335f53435 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -569,7 +569,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, // Make script to publish in study if ( isPublished ) { - map< int, string > anEntryToCommandMap; // sort publishing commands by object entry + std::map< int, std::string > anEntryToCommandMap; // sort publishing commands by object entry for (anEntryToNameIt.Initialize( theObjectNames ); anEntryToNameIt.More(); anEntryToNameIt.Next()) @@ -602,11 +602,11 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, // bind a command to the last digit of the entry int tag = aEntry.SubString( aEntry.SearchFromEnd(":")+1, aEntry.Length() ).IntegerValue(); - anEntryToCommandMap.insert( make_pair( tag, aCommand.ToCString() )); + anEntryToCommandMap.insert( std::make_pair( tag, aCommand.ToCString() )); } // add publishing commands to the script - map< int, string >::iterator anEntryToCommand = anEntryToCommandMap.begin(); + std::map< int, std::string >::iterator anEntryToCommand = anEntryToCommandMap.begin(); for ( ; anEntryToCommand != anEntryToCommandMap.end(); ++anEntryToCommand ) { anUpdatedScript += (char*)anEntryToCommand->second.c_str(); } diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx index fe9ed8e66..162844780 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx @@ -51,10 +51,10 @@ protected: private: - bool myConcaveQuad; - vector myConcaveSide; - vector myPoints; - vector myPlanes; - gp_Vec myQuadNormal; + bool myConcaveQuad; + std::vector myConcaveSide; + std::vector myPoints; + std::vector myPlanes; + gp_Vec myQuadNormal; }; #endif -- 2.39.2