Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main (04/10/2012)
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Prism_3D.hxx
diff --git
a/src/StdMeshers/StdMeshers_Prism_3D.hxx
b/src/StdMeshers/StdMeshers_Prism_3D.hxx
index 8c1e6fa78fe629b3b29764f688def0a1ea0f2fd4..42d56fe16ccfc70961435677c61aac61ff17454c 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Prism_3D.hxx
+++ b/
src/StdMeshers/StdMeshers_Prism_3D.hxx
@@
-29,25
+29,25
@@
#include "SMESH_StdMeshers.hxx"
#include "SMESH_StdMeshers.hxx"
-#include "SMESH_3D_Algo.hxx"
-#include "SMDS_TypeOfPosition.hxx"
#include "SMDS_MeshNode.hxx"
#include "SMDS_MeshNode.hxx"
+#include "SMDS_TypeOfPosition.hxx"
+#include "SMESHDS_Mesh.hxx"
+#include "SMESH_Algo.hxx"
#include "SMESH_Block.hxx"
#include "SMESH_Block.hxx"
+#include "SMESH_Comment.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Mesh.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESH_subMesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_MesherHelper.hxx"
-#include "SMESH_
Comment
.hxx"
+#include "SMESH_
subMesh
.hxx"
#include <vector>
#include <vector>
+#include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_Surface.hxx>
-#include <Adaptor2d_Curve2d.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <TopTools_IndexedMapOfOrientedShape.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <TopTools_IndexedMapOfOrientedShape.hxx>
-#include <gp_XYZ.hxx>
#include <gp_Trsf.hxx>
#include <gp_Trsf.hxx>
+#include <gp_XYZ.hxx>
class SMESHDS_SubMesh;
class SMESHDS_SubMesh;
@@
-55,7
+55,6
@@
class TopoDS_Edge;
class TopoDS_Faces;
struct TNode;
class TopoDS_Faces;
struct TNode;
-//typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap;
typedef std::vector<const SMDS_MeshNode* > TNodeColumn;
// map of bottom nodes to the column of nodes above them
typedef std::vector<const SMDS_MeshNode* > TNodeColumn;
// map of bottom nodes to the column of nodes above them