]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Fix pb with standard libraries
authorvsr <vsr@opencascade.com>
Thu, 6 Mar 2008 14:24:31 +0000 (14:24 +0000)
committervsr <vsr@opencascade.com>
Thu, 6 Mar 2008 14:24:31 +0000 (14:24 +0000)
src/GEOM/GEOM_Engine.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx

index ec1a8a6600358399daead05a13046d9912ebeeed..335f53435bc43913b6c2677ac4ed601aaeb61b1c 100644 (file)
@@ -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();
     }
index fe9ed8e66325a95f737904e62d9b33bd61f263e9..162844780f40f5648e5fceae9ba0e34688bc3a3c 100644 (file)
@@ -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