Merge from BR_V5_DEV 16Feb09

[modules/smesh.git] / src / StdMeshers / StdMeshers_RadialPrism_3D.hxx

diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx
index b7d7968021c9192ec5c7c45902a7a199ffe14f28..d0c78352216509e4d7d2a5a8c50d9e0e2b834bc9 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx
+++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx
@@ -1,29 +1,28 @@
-//  SMESH SMESH : implementaion of SMESH idl descriptions
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.

 //
 //

-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.

 //
 //

+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 //
 //

+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

 //
 //

+//  SMESH SMESH : implementaion of SMESH idl descriptions

 //  File   : StdMeshers_RadialPrism_3D.hxx
 //  Module : SMESH
 //  File   : StdMeshers_RadialPrism_3D.hxx
 //  Module : SMESH

-
+//

 #ifndef _SMESH_RadialPrism_3D_HXX_
 #define _SMESH_RadialPrism_3D_HXX_
 
 #ifndef _SMESH_RadialPrism_3D_HXX_
 #define _SMESH_RadialPrism_3D_HXX_
 


@@ -54,8 +53,8 @@ public:
 
 protected:
 
 
 protected:
 

-  typedef vector<const SMDS_MeshNode* >            TNodeColumn;
-  typedef map< const SMDS_MeshNode*, TNodeColumn > TNode2ColumnMap;
+  typedef std::vector<const SMDS_MeshNode* >            TNodeColumn;
+  typedef std::map< const SMDS_MeshNode*, TNodeColumn > TNode2ColumnMap;

 
   TNodeColumn* makeNodeColumn( TNode2ColumnMap&     n2ColMap,
                                const SMDS_MeshNode* outNode,
 
   TNodeColumn* makeNodeColumn( TNode2ColumnMap&     n2ColMap,
                                const SMDS_MeshNode* outNode,


@@ -68,7 +67,7 @@ protected:
   const StdMeshers_NumberOfLayers*    myNbLayerHypo;
   const StdMeshers_LayerDistribution* myDistributionHypo;
   SMESH_MesherHelper*                 myHelper;
   const StdMeshers_NumberOfLayers*    myNbLayerHypo;
   const StdMeshers_LayerDistribution* myDistributionHypo;
   SMESH_MesherHelper*                 myHelper;

-  vector< double >                    myLayerPositions;
+  std::vector< double >               myLayerPositions;

 };
 
 #endif
 };
 
 #endif