first executable version

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index 51d62037b2b8d48617ca9718e9b1787ce568c906..b15d32c4930338b930bfa32b1c68c38bc8487cb1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@ -92,6 +92,8 @@
 #include <vector>
 #include <set>
 
+using namespace std;
+
 
 #define SPACING 5
 #define MARGIN  10

diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h
index f511b049f6d864f089242d888f816f3f7ec6d7e5..5a0279d9cbb9cb59a25e603782b8559c26eae9d8 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h
+++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h
@@ -78,7 +78,7 @@ class SMESHGUI_EXPORT SMESHGUI_EditMeshDlg : public QDialog
   void onEditGroup();
 
   void FindGravityCenter(TColStd_MapOfInteger & ElemsIdMap, 
-                        list< gp_XYZ > & GrCentersXYZ);
+    std::list< gp_XYZ > & GrCentersXYZ);
   // add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list
 
  private:

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 11d298a6db9ad87391b8a15f3f3075a7a8d470ca..91eb0edf56a490878e21349c561aa6403c42843c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -74,6 +74,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopExp_Explorer.hxx>
 
+using namespace std;
+
 //================================================================================
 /*!
  * \brief Constructor

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index ccbdaff7d5855e096ec46ea9cdd8bcc07e2902a8..fafbf8cb10a3b3492eb9e269d905b987ea6ed4ee 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@ -56,7 +56,7 @@ namespace SMESH
       QString name = baseName;
       while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) {
         int nb = 0;
-        if ( name[ name.length()-1 ].isNumber() ) {
+        if ( name.at( name.length()-1 ).isNumber() ) {
           int nbBeg = name.findRev("_");
           nb = name.right( name.length() - nbBeg - 1 ).toInt();
           name = name.left( nbBeg );

diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index 51881af4282140a591d5109dd4ba967b1a5632c1..7faa626105df749bfcd51f76d20c2bcf29030c38 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@ -67,6 +67,8 @@
 #include <qapplication.h>
 #include <qstringlist.h>
 
+using namespace std;
+
 #define SPACING 5
 #define MARGIN  10
 

diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
index 201b1c126cffb91d3e43be3480ae5305a4fcbbc7..3dce515d8ddb1023dd695c5301885f39f87e42fa 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
@@ -63,6 +63,7 @@
 #include <qmessagebox.h>
 #include <qvalidator.h>
 
+using namespace std;
 
 #define SPACING 5
 #define MARGIN  10

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h
index dc1ed57a9b054f51d43e410579c39edc5812f9c2..bd65df64826da6fc50d7a530e7cce76d3c38122b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.h
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h
@@ -59,7 +59,7 @@ class SALOME_Actor;
 namespace SMESH {
 
   //----------------------------------------------------------------------------
-  typedef pair<int,string> TKeyOfVisualObj;
+  typedef std::pair<int,std::string> TKeyOfVisualObj;
   
 SMESHGUI_EXPORT
   TVisualObjPtr GetVisualObj(int theStudyId, 

diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx
index 4dd63f3a1f99d0cd599e4a4fa75ff423f7fb80ab..e530c2e74109fc177ab0a89709150a6c14fa673c 100644 (file)
--- a/src/SMESH_I/SMESH_MEDFamily_i.hxx
+++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx
@@ -48,16 +48,16 @@ protected :
   int       _numberOfAttribute;
   int    *  _attributeIdentifier;
   int    *  _attributeValue;
-  string *  _attributeDescription;
+  std::string *  _attributeDescription;
   int       _numberOfGroup ;
-  string *  _groupName ;
+  std::string *  _groupName ;
   
 
 public :
   
   // Constructors and associated internal methods
   SMESH_MEDFamily_i(int identifier, SMESH_subMesh_i* sm,
-                   string name, string description, SALOME_MED::medEntityMesh entity );
+                   std::string name, std::string description, SALOME_MED::medEntityMesh entity );
   SMESH_MEDFamily_i(const SMESH_MEDFamily_i & f);
   
   // IDL Methods

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx
index 05fe0727d0ca8b20160a17cf2ffc538d9bd420c3..f14ea173e7616a33c4dcf2bf21c0cd8543309d0d 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -55,22 +55,22 @@ protected:
   ::SMESH_Mesh_i * _mesh_i;
   SMESHDS_Mesh *_meshDS;
   
-  string _meshId;
+  std::string _meshId;
   bool _compte;
   bool _creeFamily;
   int _indexElts;
   int _indexEnts;
   int _famIdent;
   
-  map < SALOME_MED::medGeometryElement, int >_mapIndToSeqElts;
+  std::map < SALOME_MED::medGeometryElement, int >_mapIndToSeqElts;
   SALOME_MED::long_array_var _seq_elemId[MED_NBR_GEOMETRIE_MAILLE];
   
-  map < SALOME_MED::medEntityMesh, int >_mapNbTypes;
-  map < SALOME_MED::medEntityMesh, int >_mapIndToVectTypes;
-  vector < SALOME_MED::medGeometryElement >
+  std::map < SALOME_MED::medEntityMesh, int >_mapNbTypes;
+  std::map < SALOME_MED::medEntityMesh, int >_mapIndToVectTypes;
+  std::vector < SALOME_MED::medGeometryElement >
   _TypesId[MED_NBR_GEOMETRIE_MAILLE];
   
-  vector < SALOME_MED::FAMILY_ptr > _families;
+  std::vector < SALOME_MED::FAMILY_ptr > _families;
 public:
   
   // Constructors and associated internal methods

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx
index 3a1d164e2378cc39f0be170fd7ee595eb018067d..9f78b16cdc27d665df43e5842c091298ac50267b 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.hxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx
@@ -31,7 +31,6 @@
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MED)
-#include <string>
 
 #include "SMESHDS_Mesh.hxx"
 #include "SMESHDS_SubMesh.hxx"
@@ -40,6 +39,7 @@
 
 #include "SMESH_MEDSupport_i.hxx"
 #include "SALOME_GenericObj_i.hh"
+#include <string>
 class SMESH_subMesh_i;
 
 class SMESH_I_EXPORT SMESH_MEDSupport_i:
@@ -49,7 +49,7 @@ class SMESH_I_EXPORT SMESH_MEDSupport_i:
 
 // Constructors and associated internal methods
        SMESH_MEDSupport_i(SMESH_subMesh_i * sm,
-               string name, string description, SALOME_MED::medEntityMesh entity);
+    std::string name, std::string description, SALOME_MED::medEntityMesh entity);
        SMESH_MEDSupport_i(const SMESH_MEDSupport_i & s);
 
 // IDL Methods
@@ -102,8 +102,8 @@ class SMESH_I_EXPORT SMESH_MEDSupport_i:
        ::SMESH_subMesh_i * _subMesh_i;
 
        SMESHDS_Mesh * _meshDS;
-       string _name;
-       string _description;
+       std::string _name;
+       std::string _description;
        bool _isOnAllElements;
        bool _seqNumber;
        int _seqLength;

diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index d76ade836c5f56686a17555236a6802b090975e7..54842e09dba1a62fb0a0816954a4d9260e6f6ab3 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -326,7 +326,7 @@ public:
   SMESH::SMESH_subMesh_ptr getSubMesh(int shapeID);
   // return an existing subMesh object for the shapeID. shapeID == submeshID.
 
-  const map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
+  const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
   // return an existing group object.
 
   /*!
@@ -437,8 +437,8 @@ public:
   SMESH::double_array* BaryCenter(CORBA::Long id);
 
 
-  map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
-  map<int, ::SMESH_subMesh*> _mapSubMesh;   //NRI
+  std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
+  std::map<int, ::SMESH_subMesh*> _mapSubMesh;   //NRI
 
 private:
 
@@ -447,9 +447,9 @@ private:
   SMESH_Gen_i* _gen_i;
   int _id;          // id given by creator (unique within the creator instance)
   int _studyId;
-  map<int, SMESH::SMESH_subMesh_ptr>    _mapSubMeshIor;
-  map<int, SMESH::SMESH_GroupBase_ptr>  _mapGroups;
-  map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
+  std::map<int, SMESH::SMESH_subMesh_ptr>    _mapSubMeshIor;
+  std::map<int, SMESH::SMESH_GroupBase_ptr>  _mapGroups;
+  std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
 };
 
 #endif

diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx
index fce8298f430ac1708e708921c5811f4d104f6d5b..84e99b20cb4d36bc7602a2c0a4d7e6e55ed84252 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/src/StdMeshers/StdMeshers_Distribution.cxx
@@ -41,6 +41,8 @@
 #include <Standard_ErrorHandler.hxx>
 #endif
 
+using namespace std;
+
 Function::Function( const int conv )
 : myConv( conv )
 {

diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx
index 2dafda44ba83c375cfa82b056a38c0df4c14ce92..124e4e8bc44e740d45b884a2f3c7e2bc749dc2a8 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.hxx
+++ b/src/StdMeshers/StdMeshers_Distribution.hxx
@@ -105,14 +105,14 @@ STDMESHERS_EXPORT
 bool buildDistribution( const Function& f,
                        const double start, const double end,
                        const int nbSeg,
-                       vector<double>& data,
+                       std::vector<double>& data,
                        const double eps );
 
 STDMESHERS_EXPORT
 bool buildDistribution( const TCollection_AsciiString& f, const int conv, const double start, const double end,
-                       const int nbSeg, vector<double>& data, const double eps );
+                       const int nbSeg, std::vector<double>& data, const double eps );
 STDMESHERS_EXPORT
 bool buildDistribution( const std::vector<double>& f, const int conv, const double start, const double end,
-                       const int nbSeg, vector<double>& data, const double eps );
+                       const int nbSeg, std::vector<double>& data, const double eps );
 
 #endif

diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx
index 90eab4c7433ab9ceafdd68f69ef14e32ae3f8111..0f69e68a5f21ba69c15f6aba5cf59eec5c62711f 100644 (file)
--- a/src/StdMeshers/StdMeshers_Penta_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx
@@ -97,7 +97,7 @@ protected:
   TopTools_IndexedMapOfOrientedShape myShapeIDMap;
   SMESH_Block                        myTBlock;
   TopoDS_Shape                       myEmptyShape;
-  vector<int>                        myIsEdgeForward;
+  std::vector<int>                   myIsEdgeForward;
   //
   int myErrorStatus;
 };
@@ -214,10 +214,10 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D {
 
     void MakeNodes();
 
-    double SetHorizEdgeXYZ(const gp_XYZ&                  aBNXYZ,
-                           const int                      aFaceID,
-                           vector<const SMDS_MeshNode*>*& aCol1,
-                           vector<const SMDS_MeshNode*>*& aCol2);
+    double SetHorizEdgeXYZ(const gp_XYZ&                       aBNXYZ,
+                           const int                           aFaceID,
+                           std::vector<const SMDS_MeshNode*>*& aCol1,
+                           std::vector<const SMDS_MeshNode*>*& aCol2);
 
     void ShapeSupportID(const bool theIsUpperLayer,
                        const SMESH_Block::TShapeID theBNSSID,
@@ -256,14 +256,14 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D {
     void *                    myMesh;
     SMESH_ComputeErrorPtr     myErrorStatus;
     //
-    vector <StdMeshers_TNode> myTNodes;
+    std::vector <StdMeshers_TNode> myTNodes;
     int                       myISize;
     int                       myJSize;
     double                    myTol3D;        // Tolerance value     
     std::map < int, int >     myConnectingMap;
     //
-    vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
-    vector<gp_XYZ>            myShapeXYZ; // point on each sub-shape
+    std::vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
+    std::vector<gp_XYZ>            myShapeXYZ; // point on each sub-shape
 
     bool myCreateQuadratic;
     SMESH_MesherHelper* myTool; // tool building quadratic elements

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 3e143481a8183b2ee5368d6528e74ca05e53b5df..a737d671b68b48379e6d36aa6645f466d3eea1c7 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -65,6 +65,8 @@
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 
+using namespace std;
+
 
 #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
 #define SHOW_VERTEX(v,msg) // { \

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx
index 8d3939c2de3129343739fae5cb3f0d3cb3e9b8f6..3d5111508a1bd772dd92386a8bee13cfed8251ec 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx
@@ -87,8 +87,8 @@ class StdMeshers_ProjectionUtils
                                  TopoDS_Vertex         VV1[2],
                                  const TopoDS_Face&    face2,
                                  TopoDS_Vertex         VV2[2],
-                                 list< TopoDS_Edge > & edges1,
-                                 list< TopoDS_Edge > & edges2);
+                                 std::list< TopoDS_Edge > & edges1,
+                                 std::list< TopoDS_Edge > & edges2);
 
   /*!
    * \brief Insert vertex association defined by a hypothesis into a map

diff --git a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
index e0eedabdb2d995beb8e45fc4d2f40d5e358219a3..780d97d83d253e98c14ccc4e8fc8049dfae6e967 100644 (file)
--- a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
+++ b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
@@ -49,7 +49,7 @@ public:
   
 };
 
-class StdMeshers_UseExisting_1D: public SMESH_1D_Algo
+class STDMESHERS_EXPORT StdMeshers_UseExisting_1D: public SMESH_1D_Algo
 {
 public:
   StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 85ec4d6b42b92c64915ffe3f1da72770f89e7b0e..954beab10e7a0ad892f3ae833033c1899388e4da 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -40,6 +40,8 @@
 #include "SALOME_ListIO.hxx"
 #include "SALOMEDSClient_SObject.hxx"
 
+using namespace std;
+
 //================================================================================
 /*!
  * \brief Constructor initialized by filter

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index a5390229476285e7fdd480b097273ace420c0417..82d7f9d95c34fbfe9d2d3d38310f1bae26c0d6e3 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_NumberOfSegments_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i

diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
index e3d5f4eebfb9ee535036fb62663102b2d1655b7b..a1543f7a53e5db7454d3c205eb47040ab01c4ed9 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
@@ -26,8 +26,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
-
 #include "StdMeshers_ProjectionSource1D_i.hxx"
 
 #include "SMESH_Gen_i.hxx"
@@ -39,6 +37,8 @@ using namespace std;
 
 #include "StdMeshers_ObjRefUlils.hxx"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i