Merge br_enable_import_mesh. Enable import mesh and save/load SMESH study.

[modules/smesh.git] / src / SMESHDS / SMESHDS_Mesh.hxx

diff --git a/src/SMESHDS/SMESHDS_Mesh.hxx b/src/SMESHDS/SMESHDS_Mesh.hxx
index ce7d49a87f7bec0f7439167d4a2a2f39d545f948..2f37661552a6880c875495934e9f94f48f90bf0b 100644 (file)
--- a/src/SMESHDS/SMESHDS_Mesh.hxx
+++ b/src/SMESHDS/SMESHDS_Mesh.hxx
@@ -42,9 +42,16 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
+
 //Not portable see http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#5_4 to know more.
-#include <ext/hash_map>
-using namespace __gnu_cxx;
+#ifdef __GNUC__
+#if __GNUC__ < 3
+       #include <hash_map.h>
+#else
+       #include <ext/hash_map>
+       using namespace __gnu_cxx;
+#endif
+#endif
 
 using namespace std;
 
@@ -126,7 +133,8 @@ class SMESHDS_Mesh:public SMDS_Mesh
        void SetNodeOnVertex(SMDS_MeshNode * aNode, int Index);
        void SetMeshElementOnShape(const SMDS_MeshElement * anElt, int Index);
         ~SMESHDS_Mesh();
-
+       void logFullUpdate();
+       
   private:
        struct HashTopoDS_Shape
     {