From 8b4b072d8155f4419e311652b4a0373af6d44a2a Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 20 Mar 2008 15:51:51 +0000 Subject: [PATCH] *** empty log message *** --- src/StdMeshers/StdMeshers_Distribution.cxx | 2 ++ src/StdMeshers/StdMeshers_FaceSide.hxx | 24 +++++++++---------- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 12 +++++----- src/StdMeshers/StdMeshers_Prism_3D.hxx | 16 ++++++------- src/StdMeshers/StdMeshers_ProjectionUtils.hxx | 4 ++-- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 2 +- src/StdMeshers/StdMeshers_RadialPrism_3D.hxx | 6 ++--- 8 files changed, 35 insertions(+), 33 deletions(-) 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_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..100ddb45e 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; }; @@ -216,8 +216,8 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D { double SetHorizEdgeXYZ(const gp_XYZ& aBNXYZ, const int aFaceID, - vector*& aCol1, - vector*& aCol2); + 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..db5fd52ec 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.hxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx @@ -242,9 +242,9 @@ 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; + std::vector< std::pair< double, double> > myParams; bool myIsForward; - vector< TSideFace* > myComponents; + std::vector< TSideFace* > myComponents; SMESH_MesherHelper * myHelper; public: TSideFace( SMESH_MesherHelper* helper, @@ -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; /*! @@ -359,7 +359,7 @@ private: myError = SMESH_ComputeError::New(error,comment); return myError->IsOK(); } - //vector< SMESH_subMesh* > mySubMeshesVec; // submesh by in-block id + //std::vector< SMESH_subMesh* > mySubMeshesVec; // submesh by in-block id }; // ============================================= @@ -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_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx index 72b317be2..6e09e2fe5 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx @@ -47,7 +47,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 -- 2.39.2