From: vsr <vsr@opencascade.com>
Date: Thu, 6 Mar 2008 14:24:31 +0000 (+0000)
Subject: Fix pb with standard libraries
X-Git-Tag: V5_0_0a1~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7a2ad46e4ce00680f42a925dda07a74018a659c9;p=modules%2Fgeom.git

Fix pb with standard libraries
---

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<bool>                 myConcaveSide;
-  vector<gp_Pnt>               myPoints;
-  vector<GeomAdaptor_Surface>  myPlanes;
-  gp_Vec                       myQuadNormal;
+  bool                              myConcaveQuad;
+  std::vector<bool>                 myConcaveSide;
+  std::vector<gp_Pnt>               myPoints;
+  std::vector<GeomAdaptor_Surface>  myPlanes;
+  gp_Vec                            myQuadNormal;
 };
 #endif