Fix pb with standard libraries

diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index 252a39d7f963bf5f990e7d6890db520ad35b98ec..0b0959840775a93f5eaacf17e13cee3087d3a5b2 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@@ -1923,7 +1923,7 @@ Standard_Boolean HasAnyConnection (const Standard_Integer         theBlockIndex,
 //=============================================================================
 Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocksOld
                                                 (Handle(GEOM_Object) theCompound,
-                                                 list<BCError>&      theErrors)
+                                                 std::list<BCError>&      theErrors)
 {
   SetErrorCode(KO);
 
@@ -2075,11 +2075,11 @@ Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocksOld
 //=============================================================================
 TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
                                                 (Handle(GEOM_Object)  theCompound,
-                                                 const list<BCError>& theErrors)
+                                                 const std::list<BCError>& theErrors)
 {
   TCollection_AsciiString aDescr;
 
-  list<BCError>::const_iterator errIt = theErrors.begin();
+  std::list<BCError>::const_iterator errIt = theErrors.begin();
   int i = 0;
   for (; errIt != theErrors.end(); i++, errIt++) {
     BCError errStruct = *errIt;
@@ -2104,8 +2104,8 @@ TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
       break;
     }
 
-    list<int> sshList = errStruct.incriminated;
-    list<int>::iterator sshIt = sshList.begin();
+    std::list<int> sshList = errStruct.incriminated;
+    std::list<int>::iterator sshIt = sshList.begin();
     int jj = 0;
     for (; sshIt != sshList.end(); jj++, sshIt++) {
       if (jj > 0)
@@ -2124,7 +2124,7 @@ TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
 //=============================================================================
 Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks
                                               (Handle(GEOM_Object) theCompound,
-                                               list<BCError>&      theErrors)
+                                               std::list<BCError>&      theErrors)
 {
   SetErrorCode(KO);
 

diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
index 9b8414308680c72abcd14f2580eff28a77209592..e6d048104c793dd191759fdc00a31805c4835214 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
@@ -112,17 +112,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
 
   struct BCError {
     BCErrorType error;
-    list<int>   incriminated;
+    std::list<int>   incriminated;
   };
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
-                                             list<BCError>&      theErrors);
+                                             std::list<BCError>&      theErrors);
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
-                                          list<BCError>&      theErrors);
+                                          std::list<BCError>&      theErrors);
 
   Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object)  theCompound,
-                                         const list<BCError>& theErrors);
+                                         const std::list<BCError>& theErrors);
 
   Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape);
 

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index 9e67bc310d05025e5521f3604dd7e19523f96e04..d987edc96cb0158568f8c9b4a2d4f56f71ccc1d5 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -187,9 +187,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ShapeProcess (Handle(GEOM_Objec
  *  ShapeProcess
  */
 //=============================================================================
-void GEOMImpl_IHealingOperations::GetShapeProcessParameters (list<string>& theOperations,
-                                                             list<string>& theParams,
-                                                             list<string>& theValues)
+void GEOMImpl_IHealingOperations::GetShapeProcessParameters (std::list<std::string>& theOperations,
+                                                             std::list<std::string>& theParams,
+                                                             std::list<std::string>& theValues)
 {
   ShHealOper_ShapeProcess aHealer;
   TColStd_SequenceOfAsciiString anOperators;
@@ -198,7 +198,7 @@ void GEOMImpl_IHealingOperations::GetShapeProcessParameters (list<string>& theOp
   {
     for ( Standard_Integer i = 1; i <= anOperators.Length(); i++ )
     {
-      string anOperation = anOperators.Value( i ).ToCString();
+      std::string anOperation = anOperators.Value( i ).ToCString();
       if ( GetOperatorParameters( anOperation, theParams, theValues ) )
        theOperations.push_back( anOperation );
       else
@@ -222,15 +222,15 @@ void GEOMImpl_IHealingOperations::GetShapeProcessParameters (list<string>& theOp
  *  GetOperatorParameters
  */
 //=============================================================================
-bool GEOMImpl_IHealingOperations::GetOperatorParameters( const string theOperation, 
-                                                        list<string>& theParams,
-                                                        list<string>& theValues )
+bool GEOMImpl_IHealingOperations::GetOperatorParameters( const std::string theOperation, 
+                                                        std::list<std::string>& theParams,
+                                                        std::list<std::string>& theValues )
 {
   ShHealOper_ShapeProcess aHealer;
   int nbParamValueErrors( 0 );
-  list<string> aParams;
+  std::list<std::string> aParams;
   if ( GetParameters( theOperation, aParams ) ) {
-    for ( list<string>::iterator it = aParams.begin(); it != aParams.end(); ++it ) {
+    for ( std::list<std::string>::iterator it = aParams.begin(); it != aParams.end(); ++it ) {
       TCollection_AsciiString aParam( (Standard_CString)(*it).c_str() );
       TCollection_AsciiString aValue;
       if ( aHealer.GetParameter( aParam, aValue ) ) {
@@ -258,8 +258,8 @@ bool GEOMImpl_IHealingOperations::GetOperatorParameters( const string theOperati
  *  GetParameters
  */
 //=============================================================================
-bool GEOMImpl_IHealingOperations::GetParameters (const string theOperation,
-                                                 list<string>& theParams)
+bool GEOMImpl_IHealingOperations::GetParameters (const std::string theOperation,
+                                                 std::list<std::string>& theParams)
 {
   if ( theOperation == "SplitAngle" ) {
     theParams.push_back( "SplitAngle.Angle" );

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
index 3b36d040fb0bcf835e3cc18fc28eb9e3e0654cef..55ee3925258228085de6ec05dedc07a5c86c5cf5 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
@@ -42,17 +42,17 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations {
                                     const Handle(TColStd_HArray1OfExtendedString)& theValues );
 
   // Retrieve default Shape Process parameters (from resource file)
-  Standard_EXPORT void GetShapeProcessParameters( list<string>& theOperations,
-                                  list<string>& theParams,
-                                  list<string>& theValues );
+  Standard_EXPORT void GetShapeProcessParameters( std::list<std::string>& theOperations,
+                                                  std::list<std::string>& theParams,
+                                                  std::list<std::string>& theValues );
 
   // Retrieve default Shape Process parameters for given operator
-  Standard_EXPORT bool GetOperatorParameters( const string theOperation, 
-                              list<string>& theParams,
-                              list<string>& theValues );
+  Standard_EXPORT bool GetOperatorParameters( const std::string theOperation, 
+                                              std::list<std::string>& theParams,
+                                              std::list<std::string>& theValues );
 
   // returns all parameters that are valid for the given operation (Shape Process operator)
-  Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& theParams );                                      
+  Standard_EXPORT static bool GetParameters( const std::string theOperation, std::list<std::string>& theParams );
 
   Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject,
                                      const Handle(TColStd_HArray1OfInteger)& theFaces);

diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
index 479d1dc8b8180fb2325959382911e8d1b3e7aff6..4f65acc43d24764d5a97dec9d558859d7a52cee8 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
@@ -36,15 +36,15 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
 
   Standard_EXPORT Handle(GEOM_Object) MakeFilletAll   (Handle(GEOM_Object) theShape, double theR);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theEdges);
+                                                       std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theEdges);
+                                                           std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theFaces);
+                                                       std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theFaces);
+                                                           std::list<int> theFaces);
 
   Standard_EXPORT Handle(GEOM_Object) MakeChamferAll   (Handle(GEOM_Object) theShape, double theD);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge  (Handle(GEOM_Object) theShape,
@@ -54,27 +54,27 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
                                         double theD, double theAngle,
                                         int theFace1, int theFace2);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape,
-                                        double theD1, double theD2,
-                                        list<int> theFaces);
+                                                        double theD1, double theD2,
+                                                        std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape,
-                                        double theD, double theAngle,
-                                        list<int> theFaces);
+                                                          double theD, double theAngle,
+                                                          std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape,
-                                        double theD1, double theD2,
-                                        list<int> theEdges);
+                                                        double theD1, double theD2,
+                                                        std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape,
-                                        double theD, double theAngle,
-                                        list<int> theEdges);
+                                                          double theD, double theAngle,
+                                                          std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape,
-                                     double theWeight, double theWaterDensity,
-                                     double theMeshingDeflection);
-
+                                                     double theWeight, double theWaterDensity,
+                                                     double theMeshingDeflection);
+  
   Standard_EXPORT Standard_Integer GetSubShapeIndex (Handle(GEOM_Object) theShape,
-                                     Handle(GEOM_Object) theSubShape);
-
+                                                     Handle(GEOM_Object) theSubShape);
+  
   Standard_EXPORT static bool GetSubShape (const TopoDS_Shape& theShape,
-                           const int theIndex,
-                           TopoDS_Shape& theSubShape);
+                                           const int theIndex,
+                                           TopoDS_Shape& theSubShape);
 };
 
 #endif

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index b2b8dc364d8c2d94b81ea551411117fdde1acd22..da8b3c1d710db93abc53943e9df69b91ed5880ef 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -210,7 +210,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdge
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeWire
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_WIRE, WIRE_EDGES, "MakeWire");
 }
@@ -277,7 +277,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFace (Handle(GEOM_Object) th
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
-                             (list<Handle(GEOM_Object)> theShapes,
+                             (std::list<Handle(GEOM_Object)> theShapes,
                               const bool isPlanarWanted)
 {
   SetErrorCode(KO);
@@ -298,7 +298,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
   Handle(TColStd_HSequenceOfTransient) aShapesSeq = new TColStd_HSequenceOfTransient;
 
   // Shapes
-  list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
+  std::list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
   for (; it != theShapes.end(); it++) {
     Handle(GEOM_Function) aRefSh = (*it)->GetLastFunction();
     if (aRefSh.IsNull()) {
@@ -351,7 +351,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShell
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_SHELL, SHELL_FACES, "MakeShell");
 }
@@ -362,7 +362,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShell
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSolidShells
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_SOLID, SOLID_SHELLS, "MakeSolid");
 }
@@ -427,7 +427,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSolidShell (Handle(GEOM_Obje
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeCompound
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_COMPOUND, COMPOUND_SHAPES, "MakeCompound");
 }
@@ -438,7 +438,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeCompound
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape
-                             (list<Handle(GEOM_Object)>      theShapes,
+                             (std::list<Handle(GEOM_Object)>      theShapes,
                               const Standard_Integer         theObjectType,
                               const Standard_Integer         theFunctionType,
                               const TCollection_AsciiString& theMethodName)
@@ -461,7 +461,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape
   Handle(TColStd_HSequenceOfTransient) aShapesSeq = new TColStd_HSequenceOfTransient;
 
   // Shapes
-  list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
+  std::list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
   for (; it != theShapes.end(); it++) {
     Handle(GEOM_Function) aRefSh = (*it)->GetLastFunction();
     if (aRefSh.IsNull()) {
@@ -654,7 +654,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetGlueFaces
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
                                                 (Handle(GEOM_Object) theShape,
                                                  const Standard_Real theTolerance,
-                                                list<Handle(GEOM_Object)> theFaces,
+                                                std::list<Handle(GEOM_Object)> theFaces,
                                                  const Standard_Boolean doKeepNonSolids)
 {
   SetErrorCode(KO);
@@ -682,7 +682,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
   aCI.SetKeepNonSolids(doKeepNonSolids);
 
   Handle(TColStd_HSequenceOfTransient) aFaces = new TColStd_HSequenceOfTransient;
-  list<Handle(GEOM_Object)>::iterator it = theFaces.begin();
+  std::list<Handle(GEOM_Object)>::iterator it = theFaces.begin();
   for (; it != theFaces.end(); it++) {
     Handle(GEOM_Function) aRefSh = (*it)->GetLastFunction();
     if (aRefSh.IsNull()) {

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
index 1e8cdc2c80a992099dbfac4be5e73e5cf41eae12..8e5c6067fb7fc74b726636573d91076032b4e85e 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
@@ -54,20 +54,20 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
                                 Handle(GEOM_Object) thePoint2);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> theEdgesAndWires);
+  Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires);
 
   Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
                                      const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape,
                                                     const Standard_Real theTolerance,
@@ -78,7 +78,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
                                                           const Standard_Real theTolerance,
-                                                          list<Handle(GEOM_Object)> theFaces,
+                                                          std::list<Handle(GEOM_Object)> theFaces,
                                                            const Standard_Boolean doKeepNonSolids);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object)    theShape,
@@ -285,7 +285,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape);
 
  private:
-  Handle(GEOM_Object) MakeShape (list<Handle(GEOM_Object)>      theShapes,
+  Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)>      theShapes,
                                  const Standard_Integer         theObjectType,
                                  const Standard_Integer         theFunctionType,
                                  const TCollection_AsciiString& theMethodName);