PR: synchro V6_main tag mergeto_V7_main_11Feb13

[modules/smesh.git] / src / OBJECT / SMESH_Object.h

diff --git a/src/OBJECT/SMESH_Object.h b/src/OBJECT/SMESH_Object.h
index 5ce10b850076b6a3e73507336d4e6e188b0cdd0f..60275e44a9eb97ca079823aa5b884e907b10b30f 100644 (file)
--- a/src/OBJECT/SMESH_Object.h
+++ b/src/OBJECT/SMESH_Object.h
@@ -24,7 +24,6 @@
 //  File   : SMESH_Object.h
 //  Author : Nicolas REJNERI
 //  Module : SMESH
 //  File   : SMESH_Object.h
 //  Author : Nicolas REJNERI
 //  Module : SMESH

-//  $Header$

 //
 #ifndef SMESH_OBJECT_H
 #define SMESH_OBJECT_H
 //
 #ifndef SMESH_OBJECT_H
 #define SMESH_OBJECT_H


@@ -45,6 +44,9 @@
 #include "SMESH_Controls.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
 #include "SMESH_Controls.hxx"
 #include "SMDSAbs_ElementType.hxx"
 

+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(SMESH_Mesh)
+

 class SMDS_Mesh;
 class vtkUnstructuredGrid;
 
 class SMDS_Mesh;
 class vtkUnstructuredGrid;
 


@@ -62,6 +64,7 @@ public:
 
   virtual int GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
   virtual SMDS_Mesh* GetMesh() const = 0;
 
   virtual int GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
   virtual SMDS_Mesh* GetMesh() const = 0;

+  virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0;

 
   virtual bool GetEdgeNodes( const int theElemId,
                              const int theEdgeNum,
 
   virtual bool GetEdgeNodes( const int theElemId,
                              const int theEdgeNum,