From bef85377644b6a909a8f798c46362b898d43be3b Mon Sep 17 00:00:00 2001 From: jrt Date: Tue, 23 Sep 2003 14:33:41 +0000 Subject: [PATCH] Keep compatible with gcc 2 --- src/SMDS/SMDS_FaceOfEdges.hxx | 2 +- src/SMDS/SMDS_FaceOfNodes.hxx | 2 +- src/SMDS/SMDS_MeshEdge.hxx | 2 +- src/SMDS/SMDS_MeshElement.hxx | 2 +- src/SMDS/SMDS_Tria3OfNodes.hxx | 2 +- src/SMDS/SMDS_VolumeOfFaces.hxx | 2 +- src/SMESHDS/SMESHDS_Mesh.hxx | 11 +++++++++-- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/SMDS/SMDS_FaceOfEdges.hxx b/src/SMDS/SMDS_FaceOfEdges.hxx index 6f4d56c77..978ad5df6 100644 --- a/src/SMDS/SMDS_FaceOfEdges.hxx +++ b/src/SMDS/SMDS_FaceOfEdges.hxx @@ -22,7 +22,7 @@ #ifndef _SMDS_FaceOfEdges_HeaderFile #define _SMDS_FaceOfEdges_HeaderFile -#include +#include #include "SMDS_MeshFace.hxx" #include "SMDS_MeshEdge.hxx" #include "SMDS_Iterator.hxx" diff --git a/src/SMDS/SMDS_FaceOfNodes.hxx b/src/SMDS/SMDS_FaceOfNodes.hxx index e368a96af..809ee5f1c 100644 --- a/src/SMDS/SMDS_FaceOfNodes.hxx +++ b/src/SMDS/SMDS_FaceOfNodes.hxx @@ -22,7 +22,7 @@ #ifndef _SMDS_FaceOfNodes_HeaderFile #define _SMDS_FaceOfNodes_HeaderFile -#include +#include #include "SMDS_MeshFace.hxx" #include "SMDS_MeshNode.hxx" #include "SMDS_Iterator.hxx" diff --git a/src/SMDS/SMDS_MeshEdge.hxx b/src/SMDS/SMDS_MeshEdge.hxx index 0ed6e5548..cfef08ed7 100644 --- a/src/SMDS/SMDS_MeshEdge.hxx +++ b/src/SMDS/SMDS_MeshEdge.hxx @@ -28,7 +28,7 @@ #define _SMDS_MeshEdge_HeaderFile #include "SMDS_MeshElement.hxx" -#include +#include class SMDS_MeshEdge:public SMDS_MeshElement { diff --git a/src/SMDS/SMDS_MeshElement.hxx b/src/SMDS/SMDS_MeshElement.hxx index d35e151bd..86bc6ddb5 100644 --- a/src/SMDS/SMDS_MeshElement.hxx +++ b/src/SMDS/SMDS_MeshElement.hxx @@ -33,7 +33,7 @@ #include "SMDS_MeshElementIDFactory.hxx" #include -#include +#include using namespace std; class SMDS_MeshNode; diff --git a/src/SMDS/SMDS_Tria3OfNodes.hxx b/src/SMDS/SMDS_Tria3OfNodes.hxx index a52dd7a1f..ee4c330da 100644 --- a/src/SMDS/SMDS_Tria3OfNodes.hxx +++ b/src/SMDS/SMDS_Tria3OfNodes.hxx @@ -22,7 +22,7 @@ #ifndef _SMDS_Tria3OfNodes_HeaderFile #define _SMDS_Tria3OfNodes_HeaderFile -#include +#include #include "SMDS_MeshFace.hxx" #include "SMDS_MeshNode.hxx" #include "SMDS_Iterator.hxx" diff --git a/src/SMDS/SMDS_VolumeOfFaces.hxx b/src/SMDS/SMDS_VolumeOfFaces.hxx index ed5efc9c9..05480f3df 100644 --- a/src/SMDS/SMDS_VolumeOfFaces.hxx +++ b/src/SMDS/SMDS_VolumeOfFaces.hxx @@ -31,7 +31,7 @@ #include "SMDS_MeshFace.hxx" #include "SMDS_Iterator.hxx" #include -#include +#include using namespace std; class SMDS_VolumeOfFaces:public SMDS_MeshVolume diff --git a/src/SMESHDS/SMESHDS_Mesh.hxx b/src/SMESHDS/SMESHDS_Mesh.hxx index ce7d49a87..6159a4fca 100644 --- a/src/SMESHDS/SMESHDS_Mesh.hxx +++ b/src/SMESHDS/SMESHDS_Mesh.hxx @@ -42,9 +42,16 @@ #include #include #include + //Not portable see http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#5_4 to know more. -#include -using namespace __gnu_cxx; +#ifdef __GNUC__ +#if __GNUC__ < 3 + #include +#else + #include + using namespace __gnu_cxx; +#endif +#endif using namespace std; -- 2.30.2