From 3ef56c2b32994a97b5a4c11c2c7fc08ae106b452 Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 3 Oct 2008 11:40:07 +0000 Subject: [PATCH] Win32 Porting. Correction of Export/Import defines for Win32 platform. Removed "using namespace std" from header files. --- src/Controls/SMESH_Controls.cxx | 2 + src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 1 + src/DriverUNV/UNV_Utilities.hxx | 4 +- src/SMDS/SMDS_MeshInfo.hxx | 6 +-- src/SMESH/SMESH_2D_Algo.cxx | 1 - src/SMESH/SMESH_Algo.hxx | 2 +- src/SMESH/SMESH_Block.hxx | 10 ++-- src/SMESH/SMESH_Comment.hxx | 16 +++---- src/SMESH/SMESH_Mesh.cxx | 2 + src/SMESH/SMESH_MeshEditor.hxx | 10 ++-- src/SMESH/SMESH_OctreeNode.hxx | 23 +++++----- src/SMESH/SMESH_Pattern.hxx | 24 +++++----- src/SMESHClient/SMESH_Client.cxx | 6 ++- src/SMESHDS/SMESHDS_Mesh.hxx | 4 +- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_EditMeshDlg.h | 4 +- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 2 + src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_VTKUtils.h | 4 +- src/SMESH_I/SMESH_DumpPython.cxx | 46 ++++++++++++++++--- src/SMESH_I/SMESH_Gen_i.hxx | 26 +++++------ src/SMESH_I/SMESH_Gen_i_1.cxx | 2 + src/SMESH_I/SMESH_MEDFamily_i.hxx | 6 +-- src/SMESH_I/SMESH_MEDMesh_i.hxx | 12 ++--- src/SMESH_I/SMESH_MEDSupport_i.hxx | 8 ++-- src/SMESH_I/SMESH_Mesh_i.hxx | 12 ++--- src/SMESH_I/SMESH_Pattern_i.cxx | 1 + src/StdMeshers/StdMeshers_Distribution.cxx | 2 + src/StdMeshers/StdMeshers_Distribution.hxx | 8 ++-- src/StdMeshers/StdMeshers_FaceSide.cxx | 2 + src/StdMeshers/StdMeshers_FaceSide.hxx | 24 +++++----- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 16 +++---- src/StdMeshers/StdMeshers_Prism_3D.hxx | 18 ++++---- src/StdMeshers/StdMeshers_ProjectionUtils.hxx | 4 +- src/StdMeshers/StdMeshers_Projection_3D.cxx | 2 + .../StdMeshers_QuadToTriaAdaptor.cxx | 2 + src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 2 +- src/StdMeshers/StdMeshers_RadialPrism_3D.hxx | 6 +-- .../StdMeshers_SegmentAroundVertex_0D.cxx | 2 + .../StdMeshersGUI_ObjectReferenceParamWdg.cxx | 2 + .../StdMeshers_NumberOfSegments_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx | 2 +- 44 files changed, 192 insertions(+), 146 deletions(-) diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index a8f371a4b..569981c31 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -51,6 +51,8 @@ #include "SMDS_QuadraticFaceOfNodes.hxx" #include "SMDS_QuadraticEdge.hxx" +using namespace std; + /* AUXILIARY METHODS diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index a15dde026..64ce2bbe9 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -49,6 +49,7 @@ static int MYDEBUG = 0; #define _EDF_NODE_IDS_ using namespace MED; +using namespace std; void DriverMED_R_SMESHDS_Mesh diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx index cb6135351..cb14b08ce 100644 --- a/src/DriverUNV/UNV_Utilities.hxx +++ b/src/DriverUNV/UNV_Utilities.hxx @@ -30,15 +30,13 @@ #include namespace UNV{ - using namespace std; - class MESHDRIVERUNV_EXPORT PrefixPrinter{ static int myCounter; public: PrefixPrinter(); ~PrefixPrinter(); - static string GetPrefix(); + static std::string GetPrefix(); }; /** diff --git a/src/SMDS/SMDS_MeshInfo.hxx b/src/SMDS/SMDS_MeshInfo.hxx index 8dbccac83..614791264 100644 --- a/src/SMDS/SMDS_MeshInfo.hxx +++ b/src/SMDS/SMDS_MeshInfo.hxx @@ -2,8 +2,6 @@ // Created : Mon Sep 24 18:32:41 2007 // Author : Edward AGAPOV (eap) -using namespace std; - #ifndef SMDS_MeshInfo_HeaderFile #define SMDS_MeshInfo_HeaderFile @@ -57,8 +55,8 @@ private: int myNbPrisms , myNbQuadPrisms ; int myNbPolyhedrons; - vector myNb; // pointers to myNb... fields - vector myShift; // shift to get an index in myNb by elem->NbNodes() + std::vector myNb; // pointers to myNb... fields + std::vector myShift; // shift to get an index in myNb by elem->NbNodes() }; inline SMDS_MeshInfo::SMDS_MeshInfo(): diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx index ade8abfb7..368471486 100644 --- a/src/SMESH/SMESH_2D_Algo.cxx +++ b/src/SMESH/SMESH_2D_Algo.cxx @@ -26,7 +26,6 @@ // Module : SMESH // $Header$ -using namespace std; #include "SMESH_2D_Algo.hxx" #include "SMESH_Gen.hxx" diff --git a/src/SMESH/SMESH_Algo.hxx b/src/SMESH/SMESH_Algo.hxx index d5178308f..dff9f7a97 100644 --- a/src/SMESH/SMESH_Algo.hxx +++ b/src/SMESH/SMESH_Algo.hxx @@ -150,7 +150,7 @@ public: * have a name (type) listed in the algorithm. Hypothesis associated to * father shape -are not- taken into account (see GetUsedHypothesis) */ - const list & + const std::list & GetAppliedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, const bool ignoreAuxiliary=true); diff --git a/src/SMESH/SMESH_Block.hxx b/src/SMESH/SMESH_Block.hxx index c5bbc1e2f..14d727012 100644 --- a/src/SMESH/SMESH_Block.hxx +++ b/src/SMESH/SMESH_Block.hxx @@ -115,10 +115,10 @@ class SMESH_EXPORT SMESH_Block: public math_FunctionSetWithDerivatives // ShapeIndex( ID_Ex00 ) == 0 // ShapeIndex( ID_Ex10 ) == 1 - static void GetFaceEdgesIDs (const int faceID, vector< int >& edgeVec ); + static void GetFaceEdgesIDs (const int faceID, std::vector< int >& edgeVec ); // return edges IDs of a face in the order u0, u1, 0v, 1v - static void GetEdgeVertexIDs (const int edgeID, vector< int >& vertexVec ); + static void GetEdgeVertexIDs (const int edgeID, std::vector< int >& vertexVec ); // return vertex IDs of an edge static int GetCoordIndOnEdge (const int theEdgeID) @@ -161,7 +161,7 @@ class SMESH_EXPORT SMESH_Block: public math_FunctionSetWithDerivatives bool LoadMeshBlock(const SMDS_MeshVolume* theVolume, const int theNode000Index, const int theNode001Index, - vector& theOrderedNodes); + std::vector& theOrderedNodes); // prepare to work with theVolume and // return nodes in theVolume corners in the order of TShapeID enum @@ -225,7 +225,7 @@ public: // return coordinates of a point in shell static bool ShellPoint(const gp_XYZ& theParams, - const vector& thePointOnShape, + const std::vector& thePointOnShape, gp_XYZ& thePoint ); // computes coordinates of a point in shell by points on sub-shapes // and point parameters. @@ -377,7 +377,7 @@ public: gp_XYZ myParam; // the best parameters guess double myValues[ 4 ]; // values computed at myParam: square distance and 3 derivatives - typedef pair TxyzPair; + typedef std::pair TxyzPair; TxyzPair my3x3x3GridNodes[ 27 ]; // to compute the first param guess bool myGridComputed; }; diff --git a/src/SMESH/SMESH_Comment.hxx b/src/SMESH/SMESH_Comment.hxx index 9385dab54..9e2a18425 100644 --- a/src/SMESH/SMESH_Comment.hxx +++ b/src/SMESH/SMESH_Comment.hxx @@ -33,34 +33,32 @@ # include # include -using namespace std; - /*! * \brief Class to generate string from any type */ -class SMESH_Comment : public string +class SMESH_Comment : public std::string { - ostringstream _s ; + std::ostringstream _s ; public : - SMESH_Comment():string("") {} + SMESH_Comment(): std::string("") {} - SMESH_Comment(const SMESH_Comment& c):string() { + SMESH_Comment(const SMESH_Comment& c): std::string() { _s << c.c_str() ; - this->string::operator=( _s.str() ); + this->std::string::operator=( _s.str() ); } template SMESH_Comment( const T &anything ) { _s << anything ; - this->string::operator=( _s.str() ); + this->std::string::operator=( _s.str() ); } template SMESH_Comment & operator<<( const T &anything ) { _s << anything ; - this->string::operator=( _s.str() ); + this->std::string::operator=( _s.str() ); return *this ; } }; diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index 02383cb28..4c3c0a6a0 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -69,6 +69,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + #define cSMESH_Hyp(h) static_cast(h) typedef SMESH_HypoFilter THypType; diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx index fd5facec2..c70d40956 100644 --- a/src/SMESH/SMESH_MeshEditor.hxx +++ b/src/SMESH/SMESH_MeshEditor.hxx @@ -313,9 +313,9 @@ public: */ SMESH_NodeSearcher* GetNodeSearcher(); - int SimplifyFace (const vector faceNodes, - vector& poly_nodes, - vector& quantities) const; + int SimplifyFace (const std::vector faceNodes, + std::vector& poly_nodes, + std::vector& quantities) const; // Split face, defined by , into several faces by repeating nodes. // Is used by MergeNodes() @@ -478,8 +478,8 @@ public: * \param nReplaceMap - output map of corresponding nodes * \retval Sew_Error - is a success or not */ - static Sew_Error FindMatchingNodes(set& theSide1, - set& theSide2, + static Sew_Error FindMatchingNodes(std::set& theSide1, + std::set& theSide2, const SMDS_MeshNode* theFirstNode1, const SMDS_MeshNode* theFirstNode2, const SMDS_MeshNode* theSecondNode1, diff --git a/src/SMESH/SMESH_OctreeNode.hxx b/src/SMESH/SMESH_OctreeNode.hxx index 70133845d..57a258175 100644 --- a/src/SMESH/SMESH_OctreeNode.hxx +++ b/src/SMESH/SMESH_OctreeNode.hxx @@ -24,11 +24,9 @@ // // File : SMESH_OctreeNode.hxx // Created : Tue Jan 16 16:00:00 2007 -// Author : Nicolas Geimer & Aurélien Motteux (OCC) +// Author : Nicolas Geimer & Aurélien Motteux (OCC) // Module : SMESH -using namespace std; - #ifndef _SMESH_OCTREENODE_HXX_ #define _SMESH_OCTREENODE_HXX_ @@ -51,7 +49,7 @@ class SMESH_OctreeNode : public SMESH_Octree{ public: // Constructor - SMESH_OctreeNode (const set& theNodes, const int maxLevel = -1, + SMESH_OctreeNode (const std::set& theNodes, const int maxLevel = -1, const int maxNbNodes = 5 , const double minBoxSize = 0.); //============================= @@ -68,19 +66,20 @@ public: virtual const bool isInside(const SMDS_MeshNode * Node, const double precision = 0. ); // Return in Result a list of Nodes potentials to be near Node - void NodesAround( const SMDS_MeshNode * Node , list* Result, + void NodesAround( const SMDS_MeshNode * Node , + std::list* Result, const double precision = 0. ); // Return in theGroupsOfNodes a list of group of nodes close to each other within theTolerance // Search for all the nodes in nodes - void FindCoincidentNodes ( set* nodes, + void FindCoincidentNodes ( std::set* nodes, const double theTolerance, - list< list< const SMDS_MeshNode*> >* theGroupsOfNodes); + std::list< std::list< const SMDS_MeshNode*> >* theGroupsOfNodes); // Static method that return in theGroupsOfNodes a list of group of nodes close to each other within // theTolerance search for all the nodes in nodes - static void FindCoincidentNodes ( set nodes, - list< list< const SMDS_MeshNode*> >* theGroupsOfNodes, + static void FindCoincidentNodes ( std::set nodes, + std::list< std::list< const SMDS_MeshNode*> >* theGroupsOfNodes, const double theTolerance = 0.00001, const int maxLevel = -1, const int maxNbNodes = 5); /*! @@ -116,15 +115,15 @@ protected: // Return in result a list of nodes closed to Node and remove it from SetOfNodes void FindCoincidentNodes( const SMDS_MeshNode * Node, - set* SetOfNodes, - list* Result, + std::set* SetOfNodes, + std::list* Result, const double precision); // The max number of nodes a leaf box can contain int myMaxNbNodes; // The set of nodes inside the box of the Octree (Empty if Octree is not a leaf) - set myNodes; + std::set myNodes; // The number of nodes I have inside the box int myNbNodes; diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx index 3a3278914..fe40a5152 100644 --- a/src/SMESH/SMESH_Pattern.hxx +++ b/src/SMESH/SMESH_Pattern.hxx @@ -21,8 +21,6 @@ // Created : Mon Aug 2 10:30:00 2004 // Author : Edward AGAPOV (eap) -using namespace std; - #ifndef SMESH_Pattern_HeaderFile #define SMESH_Pattern_HeaderFile @@ -248,51 +246,51 @@ private: bool setShapeToMesh(const TopoDS_Shape& theShape); // Set a shape to be meshed. Return True if meshing is possible - list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape); + std::list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape); // Return list of points located on theShape. // A list of edge-points include vertex-points (for 2D pattern only). // A list of face-points doesnt include edge-points. // A list of volume-points doesnt include face-points. - list< TPoint* > & getShapePoints(const int theShapeID); + std::list< TPoint* > & getShapePoints(const int theShapeID); // Return list of points located on the shape bool findBoundaryPoints(); // If loaded from file, find points to map on edges and faces and // compute their parameters - void arrangeBoundaries (list< list< TPoint* > >& boundaryPoints); + void arrangeBoundaries (std::list< std::list< TPoint* > >& boundaryPoints); // if there are several wires, arrange boundaryPoints so that // the outer wire goes first and fix inner wires orientation; // update myKeyPointIDs to correspond to the order of key-points // in boundaries; sort internal boundaries by the nb of key-points - void computeUVOnEdge( const TopoDS_Edge& theEdge, const list< TPoint* > & ePoints ); + void computeUVOnEdge( const TopoDS_Edge& theEdge, const std::list< TPoint* > & ePoints ); // compute coordinates of points on theEdge - bool compUVByIsoIntersection (const list< list< TPoint* > >& boundaryPoints, + bool compUVByIsoIntersection (const std::list< std::list< TPoint* > >& boundaryPoints, const gp_XY& theInitUV, gp_XY& theUV, bool & theIsDeformed); // compute UV by intersection of iso-lines found by points on edges - bool compUVByElasticIsolines(const list< list< TPoint* > >& boundaryPoints, - const list< TPoint* >& pointsToCompute); + bool compUVByElasticIsolines(const std::list< std::list< TPoint* > >& boundaryPoints, + const std::list< TPoint* >& pointsToCompute); // compute UV as nodes of iso-poly-lines consisting of // segments keeping relative size as in the pattern - double setFirstEdge (list< TopoDS_Edge > & theWire, int theFirstEdgeID); + double setFirstEdge (std::list< TopoDS_Edge > & theWire, int theFirstEdgeID); // choose the best first edge of theWire; return the summary distance // between point UV computed by isolines intersection and // eventual UV got from edge p-curves - typedef list< list< TopoDS_Edge > > TListOfEdgesList; + typedef std::list< std::list< TopoDS_Edge > > TListOfEdgesList; bool sortSameSizeWires (TListOfEdgesList & theWireList, const TListOfEdgesList::iterator& theFromWire, const TListOfEdgesList::iterator& theToWire, const int theFirstEdgeID, - list< list< TPoint* > >& theEdgesPointsList ); + std::list< std::list< TPoint* > >& theEdgesPointsList ); // sort wires in theWireList from theFromWire until theToWire, // the wires are set in the order to correspond to the order // of boundaries; after sorting, edges in the wires are put @@ -354,7 +352,7 @@ private: // all functions assure that shapes are indexed so that first go // ordered vertices, then ordered edge, then faces and maybe a shell TopTools_IndexedMapOfOrientedShape myShapeIDMap; - std::map< int, list< TPoint* > > myShapeIDToPointsMap; + std::map< int, std::list< TPoint* > > myShapeIDToPointsMap; // for the 2d case: // nb of key-points in each of pattern boundaries diff --git a/src/SMESHClient/SMESH_Client.cxx b/src/SMESHClient/SMESH_Client.cxx index add923749..bb6e93318 100644 --- a/src/SMESHClient/SMESH_Client.cxx +++ b/src/SMESHClient/SMESH_Client.cxx @@ -35,7 +35,7 @@ #include CORBA_SERVER_HEADER(SALOME_Component) #include CORBA_SERVER_HEADER(SALOME_Exception) -#include "OpUtil.hxx" +#include "Basics_Utils.hxx" #include "utilities.h" #ifdef WNT @@ -60,6 +60,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + namespace { @@ -591,7 +593,7 @@ SMESH_Client::GetSMESHGen(CORBA::ORB_ptr theORB, Engines::Component_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH"); aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent); - std::string aClientHostName = GetHostname(); + std::string aClientHostName = Kernel_Utils::GetHostname(); Engines::Container_var aServerContainer = aMeshGen->GetContainerRef(); CORBA::String_var aServerHostName = aServerContainer->getHostName(); CORBA::Long aServerPID = aServerContainer->getPID(); diff --git a/src/SMESHDS/SMESHDS_Mesh.hxx b/src/SMESHDS/SMESHDS_Mesh.hxx index dac69c020..1cc122d46 100644 --- a/src/SMESHDS/SMESHDS_Mesh.hxx +++ b/src/SMESHDS/SMESHDS_Mesh.hxx @@ -438,9 +438,9 @@ private: void addNodeToSubmesh( const SMDS_MeshNode* aNode, int Index ) { //Update or build submesh - map::iterator it = myShapeIndexToSubMesh.find( Index ); + std::map::iterator it = myShapeIndexToSubMesh.find( Index ); if ( it == myShapeIndexToSubMesh.end() ) - it = myShapeIndexToSubMesh.insert( make_pair(Index, new SMESHDS_SubMesh() )).first; + it = myShapeIndexToSubMesh.insert( std::make_pair(Index, new SMESHDS_SubMesh() )).first; it->second->AddNode( aNode ); // add aNode to submesh } diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index c06738ba0..be850034a 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -94,6 +94,8 @@ #include #include +using namespace std; + #define SPACING 5 #define MARGIN 10 diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h index 5ea81ec34..5a0279d9c 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h @@ -18,8 +18,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #ifndef SMESHGUI_EditMeshDlg_H #define SMESHGUI_EditMeshDlg_H @@ -80,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 9257f2b6d..c51589068 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -74,6 +74,8 @@ #include #include +using namespace std; + //================================================================================ /*! * \brief Constructor diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index 5a506dab4..41da2477f 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -67,10 +67,11 @@ #include #include +using namespace std; + #define SPACING 5 #define MARGIN 10 - enum { EDGE = 0, FACE, VOLUME }; /*! diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index c86235c5a..650dc26e5 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -67,6 +67,8 @@ #define SPACING 5 #define MARGIN 10 +using namespace std; + /*! \class BusyLocker \brief Simple 'busy state' flag locker. diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index d13e37de3..bd65df648 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -17,8 +17,6 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -using namespace std; - #ifndef SMESHGUI_VTKUtils_HeaderFile #define SMESHGUI_VTKUtils_HeaderFile @@ -61,7 +59,7 @@ class SALOME_Actor; namespace SMESH { //---------------------------------------------------------------------------- - typedef pair TKeyOfVisualObj; + typedef std::pair TKeyOfVisualObj; SMESHGUI_EXPORT TVisualObjPtr GetVisualObj(int theStudyId, diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index 1fee7112e..a895ea40a 100644 --- a/src/SMESH_I/SMESH_DumpPython.cxx +++ b/src/SMESH_I/SMESH_DumpPython.cxx @@ -31,6 +31,7 @@ #include #include +#include #ifdef _DEBUG_ @@ -39,6 +40,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + static TCollection_AsciiString NotPublishedObjectName() { return "__NOT__Published__Object__"; @@ -61,10 +64,10 @@ namespace SMESH SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy(); if(!aStudy->_is_nil()){ - std::string aString = myStream.str(); - TCollection_AsciiString aCollection(Standard_CString(aString.c_str())); - aSMESHGen->AddToPythonScript(aStudy->StudyId(),aCollection); - if(MYDEBUG) MESSAGE(aString); + string aString = myStream.str(); + TCollection_AsciiString aCollection(Standard_CString(aString.c_str())); + aSMESHGen->AddToPythonScript(aStudy->StudyId(),aCollection); + if(MYDEBUG) MESSAGE(aString); } } } @@ -171,11 +174,12 @@ namespace SMESH SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy(); SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); - if(!aSObject->_is_nil()) { + if(!aSObject->_is_nil()) myStream << aSObject->GetID(); - } else if ( !CORBA::is_nil(theArg)) { - if ( aSMESHGen->CanPublishInStudy( theArg )) // not published SMESH object + else if ( !CORBA::is_nil(theArg)) { + if ( aSMESHGen->CanPublishInStudy( theArg )) { // not published SMESH object myStream << "smeshObj_" << size_t(theArg); + } else myStream << NotPublishedObjectName(); } @@ -458,6 +462,34 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, aScript += DumpPython_impl(aStudy->StudyId(), aMap, aMapNames, isPublished, isValidScript, aSavedTrace); + //inserting export for Object Names + TCollection_AsciiString def = "def RebuildData(theStudy):\n"; + int pos = aScript.Search( def ); + if ( pos != -1 ) + { + //insert global definition + TCollection_AsciiString glob; + for( Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString It(aMap); + It.More(); It.Next() ) + { + TCollection_AsciiString name = It.Value(); + //check valid name + if ( !name.IsEmpty() && name.Search(' ') == -1 && name.Search( ':' ) == -1 + && !name.IsIntegerValue() && !name.IsEqual("Hypotheses") && !name.IsEqual("Algorithms") ) + { + if ( glob.Length() > 0 ) + glob += ','; + glob += name; + } + } + if ( glob.Length() > 0 ) + { + glob.Prepend( "\tglobal " ); + glob += '\n'; + } + + aScript.Insert( pos + def.Length(), glob ); + } int aLen = aScript.Length(); unsigned char* aBuffer = new unsigned char[aLen+1]; strcpy((char*)aBuffer, aScript.ToCString()); diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx index ae64c1175..4b08eed35 100644 --- a/src/SMESH_I/SMESH_Gen_i.hxx +++ b/src/SMESH_I/SMESH_Gen_i.hxx @@ -72,16 +72,16 @@ public: mapIdToId.clear(); } // register object in the internal map and return its id - int addObject( string theIOR ) + int addObject( std::string theIOR ) { int nextId = getNextId(); mapIdToIOR[ nextId ] = theIOR; return nextId; } // find the object id in the internal map by the IOR - int findId( string theIOR ) + int findId( std::string theIOR ) { - map::iterator imap; + std::map::iterator imap; for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) { if ( imap->second == theIOR ) return imap->first; @@ -89,18 +89,18 @@ public: return 0; } // get object's IOR by id - string getIORbyId( const int theId ) + std::string getIORbyId( const int theId ) { if ( mapIdToIOR.find( theId ) != mapIdToIOR.end() ) return mapIdToIOR[ theId ]; - return string( "" ); + return std::string( "" ); } // get object's IOR by old id - string getIORbyOldId( const int theOldId ) + std::string getIORbyOldId( const int theOldId ) { if ( mapIdToId.find( theOldId ) != mapIdToId.end() ) return getIORbyId( mapIdToId[ theOldId ] ); - return string( "" ); + return std::string( "" ); } // maps old object id to the new one (used when restoring data) void mapOldToNew( const int oldId, const int newId ) { @@ -108,7 +108,7 @@ public: } // get old id by a new one int getOldId( const int newId ) { - map::iterator imap; + std::map::iterator imap; for ( imap = mapIdToId.begin(); imap != mapIdToId.end(); ++imap ) { if ( imap->second == newId ) return imap->first; @@ -126,8 +126,8 @@ private: return id; } - map mapIdToIOR; // persistent-to-transient map - map mapIdToId; // used to translate object from persistent to transient form + std::map mapIdToIOR; // persistent-to-transient map + std::map mapIdToId; // used to translate object from persistent to transient form }; // =========================================================== @@ -454,7 +454,7 @@ public: typename TInterface::_var_type GetObjectByOldId( const int oldID ) { if ( StudyContext* myStudyContext = GetCurrentStudyContext() ) { - string ior = myStudyContext->getIORbyOldId( oldID ); + std::string ior = myStudyContext->getIORbyOldId( oldID ); if ( !ior.empty() ) return TInterface::_narrow(GetORB()->string_to_object( ior.c_str() )); } @@ -492,9 +492,9 @@ private: ::SMESH_Gen myGen; // SMESH_Gen local implementation // hypotheses managing - map myHypCreatorMap; + std::map myHypCreatorMap; - map myStudyContextMap; // Map of study context objects + std::map myStudyContextMap; // Map of study context objects GEOM_Client* myShapeReader; // Shape reader SALOMEDS::Study_var myCurrentStudy; // Current study diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 3d87ad4f6..22be7c461 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -47,6 +47,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + //============================================================================= /*! * Get...Tag [ static ] diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx index 4dd63f3a1..e530c2e74 100644 --- 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 ef4526cc6..21d6dbb49 100644 --- 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 3a1d164e2..9f78b16cd 100644 --- a/src/SMESH_I/SMESH_MEDSupport_i.hxx +++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx @@ -31,7 +31,6 @@ #include #include CORBA_SERVER_HEADER(MED) -#include #include "SMESHDS_Mesh.hxx" #include "SMESHDS_SubMesh.hxx" @@ -40,6 +39,7 @@ #include "SMESH_MEDSupport_i.hxx" #include "SALOME_GenericObj_i.hh" +#include 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 242548369..6d0f5e47f 100644 --- a/src/SMESH_I/SMESH_Mesh_i.hxx +++ b/src/SMESH_I/SMESH_Mesh_i.hxx @@ -331,7 +331,7 @@ public: SMESH::SMESH_subMesh_ptr getSubMesh(int shapeID); // return an existing subMesh object for the shapeID. shapeID == submeshID. - const map& getGroups() { return _mapGroups; } + const std::map& getGroups() { return _mapGroups; } // return an existing group object. /*! @@ -446,8 +446,8 @@ public: */ virtual SALOME_MED::MedFileInfo* GetMEDFileInfo(); - map _mapSubMesh_i; //NRI - map _mapSubMesh; //NRI + std::map _mapSubMesh_i; //NRI + std::map _mapSubMesh; //NRI private: @@ -456,9 +456,9 @@ private: SMESH_Gen_i* _gen_i; int _id; // id given by creator (unique within the creator instance) int _studyId; - map _mapSubMeshIor; - map _mapGroups; - map _mapHypo; + std::map _mapSubMeshIor; + std::map _mapGroups; + std::map _mapHypo; SALOME_MED::MedFileInfo_var myFileInfo; }; diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx index 4f730b387..63107a405 100644 --- a/src/SMESH_I/SMESH_Pattern_i.cxx +++ b/src/SMESH_I/SMESH_Pattern_i.cxx @@ -47,6 +47,7 @@ #include using SMESH::TPythonDump; +using namespace std; //======================================================================= //function : dumpErrorCode diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx index fce8298f4..84e99b20c 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -41,6 +41,8 @@ #include #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 831a94441..124e4e8bc 100644 --- a/src/StdMeshers/StdMeshers_Distribution.hxx +++ b/src/StdMeshers/StdMeshers_Distribution.hxx @@ -29,8 +29,6 @@ #ifndef _STD_MESHERS_DISTRIBUTION_HXX_ #define _STD_MESHERS_DISTRIBUTION_HXX_ -using namespace std; - #include "SMESH_StdMeshers.hxx" #include @@ -107,14 +105,14 @@ STDMESHERS_EXPORT bool buildDistribution( const Function& f, const double start, const double end, const int nbSeg, - vector& data, + std::vector& 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& data, const double eps ); + const int nbSeg, std::vector& data, const double eps ); STDMESHERS_EXPORT bool buildDistribution( const std::vector& f, const int conv, const double start, const double end, - const int nbSeg, vector& data, const double eps ); + const int nbSeg, std::vector& data, const double eps ); #endif diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx index d0ec9bcb5..ebab0bea9 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.cxx +++ b/src/StdMeshers/StdMeshers_FaceSide.cxx @@ -53,6 +53,8 @@ #include "utilities.h" +using namespace std; + //================================================================================ /*! * \brief Constructor of a side of one edge diff --git a/src/StdMeshers/StdMeshers_FaceSide.hxx b/src/StdMeshers/StdMeshers_FaceSide.hxx index e34dfe512..aa29e80a7 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.hxx +++ b/src/StdMeshers/StdMeshers_FaceSide.hxx @@ -90,7 +90,7 @@ public: * \brief Wrap several edges. Edges must be properly ordered and oriented. */ StdMeshers_FaceSide(const TopoDS_Face& theFace, - list& theEdges, + std::list& theEdges, SMESH_Mesh* theMesh, const bool theIsForward, const bool theIgnoreMediumNodes); @@ -130,13 +130,13 @@ public: * * Missing nodes are allowed only on internal vertices */ - const vector& GetUVPtStruct(bool isXConst =0, double constValue =0) const; + const std::vector& GetUVPtStruct(bool isXConst =0, double constValue =0) const; /*! * \brief Simulates detailed data on nodes * \param isXConst - true if normalized parameter X is constant * \param constValue - constant parameter value */ - const vector& SimulateUVPtStruct(int nbSeg, + const std::vector& SimulateUVPtStruct(int nbSeg, bool isXConst = 0, double constValue = 0) const; /*! @@ -194,15 +194,15 @@ public: protected: - vector myPoints, myFalsePoints; - vector myEdge; - vector myC2d; - vector myFirst, myLast; - vector myNormPar; - double myLength; - int myNbPonits, myNbSegments; - SMESH_Mesh* myMesh; - bool myMissingVertexNodes, myIgnoreMediumNodes; + std::vector myPoints, myFalsePoints; + std::vector myEdge; + std::vector myC2d; + std::vector myFirst, myLast; + std::vector myNormPar; + double myLength; + int myNbPonits, myNbSegments; + SMESH_Mesh* myMesh; + bool myMissingVertexNodes, myIgnoreMediumNodes; }; diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx index 1f1c4042d..c05a94ae4 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx @@ -92,7 +92,7 @@ protected: int GetFaceIndex(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, - const vector& meshFaces, + const std::vector& meshFaces, const TopoDS_Vertex& V0, const TopoDS_Vertex& V1, const TopoDS_Vertex& V2, diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx index 90eab4c74..0f69e68a5 100644 --- 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 myIsEdgeForward; + std::vector 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*& aCol1, - vector*& aCol2); + double SetHorizEdgeXYZ(const gp_XYZ& aBNXYZ, + const int aFaceID, + std::vector*& aCol1, + std::vector*& 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 myTNodes; + std::vector myTNodes; int myISize; int myJSize; double myTol3D; // Tolerance value std::map < int, int > myConnectingMap; // - vector myWallNodesMaps; // nodes on a face - vector myShapeXYZ; // point on each sub-shape + std::vector myWallNodesMaps; // nodes on a face + std::vector myShapeXYZ; // point on each sub-shape bool myCreateQuadratic; SMESH_MesherHelper* myTool; // tool building quadratic elements diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx index d6fab7b38..00a81e3b7 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.hxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx @@ -242,10 +242,10 @@ private: BRepAdaptor_Surface mySurface; TopoDS_Edge myBaseEdge; // first and last normalized params and orientaion for each component or it-self - vector< pair< double, double> > myParams; - bool myIsForward; - vector< TSideFace* > myComponents; - SMESH_MesherHelper * myHelper; + std::vector< std::pair< double, double> > myParams; + bool myIsForward; + std::vector< TSideFace* > myComponents; + SMESH_MesherHelper * myHelper; public: TSideFace( SMESH_MesherHelper* helper, const int faceID, @@ -255,7 +255,7 @@ private: const double first = 0.0, const double last = 1.0); TSideFace( const std::vector< TSideFace* >& components, - const std::vector< pair< double, double> > & params); + const std::vector< std::pair< double, double> > & params); TSideFace( const TSideFace& other ); ~TSideFace(); bool IsComplex() const @@ -347,9 +347,9 @@ private: // container of 4 side faces TSideFace* mySide; // node columns for each base edge - vector< TParam2ColumnMap > myParam2ColumnMaps; + std::vector< TParam2ColumnMap > myParam2ColumnMaps; // to find a column for a node by edge SMESHDS Index - map< int, pair< TParam2ColumnMap*, bool > > myShapeIndex2ColumnMap; + std::map< int, std::pair< TParam2ColumnMap*, bool > > myShapeIndex2ColumnMap; SMESH_ComputeErrorPtr myError; /*! @@ -395,7 +395,7 @@ public: * \param nodeColumns - columns of nodes generated from nodes of a mesh face * \param helper - helper initialized by mesh and shape to add prisms to */ - static void AddPrisms( vector & nodeColumns, + static void AddPrisms( std::vector & nodeColumns, SMESH_MesherHelper* helper); private: @@ -430,7 +430,7 @@ private: StdMeshers_PrismAsBlock myBlock; SMESH_MesherHelper* myHelper; - vector myShapeXYZ; // point on each sub-shape + std::vector myShapeXYZ; // point on each sub-shape // map of bottom nodes to the column of nodes above them // (the column includes the bottom node) diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx index 8d3939c2d..3d5111508 100644 --- 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_Projection_3D.cxx b/src/StdMeshers/StdMeshers_Projection_3D.cxx index af93f888d..a1726f684 100644 --- a/src/StdMeshers/StdMeshers_Projection_3D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_3D.cxx @@ -52,6 +52,8 @@ #include #include +using namespace std; + #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z()) #define SHOWYXZ(msg, xyz) // {\ diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx index 3892ddc9b..13bbf2581 100644 --- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx +++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx @@ -46,6 +46,8 @@ #include typedef NCollection_Array1 StdMeshers_Array1OfSequenceOfInteger; +using namespace std; + //======================================================================= //function : StdMeshers_QuadToTriaAdaptor diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx index 18ae6aae9..246769e2d 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx @@ -46,7 +46,7 @@ enum TSideID { BOTTOM_SIDE=0, RIGHT_SIDE, TOP_SIDE, LEFT_SIDE, NB_SIDES }; typedef uvPtStruct UVPtStruct; typedef struct faceQuadStruct { - vector< StdMeshers_FaceSide*> side; + std::vector< StdMeshers_FaceSide*> side; bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite UVPtStruct* uv_grid; ~faceQuadStruct(); diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx index b7d796802..19d1664ec 100644 --- a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx +++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx @@ -54,8 +54,8 @@ public: protected: - typedef vector TNodeColumn; - typedef map< const SMDS_MeshNode*, TNodeColumn > TNode2ColumnMap; + typedef std::vector TNodeColumn; + typedef std::map< const SMDS_MeshNode*, TNodeColumn > TNode2ColumnMap; TNodeColumn* makeNodeColumn( TNode2ColumnMap& n2ColMap, const SMDS_MeshNode* outNode, @@ -68,7 +68,7 @@ protected: const StdMeshers_NumberOfLayers* myNbLayerHypo; const StdMeshers_LayerDistribution* myDistributionHypo; SMESH_MesherHelper* myHelper; - vector< double > myLayerPositions; + std::vector< double > myLayerPositions; }; #endif diff --git a/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cxx b/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cxx index c4e809dca..9610615a9 100644 --- a/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cxx +++ b/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cxx @@ -29,6 +29,8 @@ #include "StdMeshers_SegmentAroundVertex_0D.hxx" +using namespace std; + //======================================================================= //function : StdMeshers_SegmentAroundVertex_0D //purpose : diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx index 85ec4d6b4..954beab10 100644 --- 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 a53902294..82d7f9d95 100644 --- 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 +using namespace std; + //============================================================================= /*! * StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i diff --git a/src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx b/src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx index 994f39594..b87f3135b 100644 --- a/src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx +++ b/src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx @@ -101,7 +101,7 @@ public: std::string str; if (stream >> str) { if ( StudyContext* myStudyContext = gen->GetCurrentStudyContext() ) { - string ior = myStudyContext->getIORbyOldId( atoi( str.c_str() )); + std::string ior = myStudyContext->getIORbyOldId( atoi( str.c_str() )); if ( !ior.empty() ) return TInterface::_narrow(gen->GetORB()->string_to_object( ior.c_str() )); } -- 2.39.2