Preparation of 3.1.0a2: version ID. compilation with new HEAD and new MED (with polyh...

[modules/smesh.git] / src / SMESH_I / SMESH_MEDMesh_i.hxx

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx
index 1c9308e1d98e2eca90d23f6c5d06609975c5ad7a..3b0fedec9c9c338bbe8ce1e85893e5061603d405 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -37,6 +37,7 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
+#include "SALOME_GenericObj_i.hh"
 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5
@@ -44,7 +45,7 @@
 class SMESH_Mesh_i;
 
 class SMESH_MEDMesh_i:
-       public POA_SALOME_MED::MESH, public PortableServer::RefCountServantBase
+       public virtual POA_SALOME_MED::MESH, public virtual SALOME::GenericObj_i
 {
   public: private: protected:
        // C++ object containing values
@@ -74,12 +75,17 @@ class SMESH_MEDMesh_i:
        SMESH_MEDMesh_i(SMESH_Mesh_i * m);
        ~SMESH_MEDMesh_i();
 
-       // IDL Methods 
+       // IDL Methods
        void setProtocol(SALOME::TypeOfCommunication typ) {}
        void release() {}
-       SALOME::Sender_ptr getSenderForCoordinates(long int) {return SALOME::Sender::_nil();}
-       SALOME::Sender_ptr getSenderForConnectivity(long int, long int, long int, long int) {return SALOME::Sender::_nil();}
-
+       SALOME::SenderDouble_ptr getSenderForCoordinates(long int) {return SALOME::SenderDouble::_nil();}
+       SALOME::SenderInt_ptr getSenderForConnectivity(long int, long int, long int, long int) {return SALOME::SenderInt::_nil();}
+        SALOME::SenderInt_ptr getSenderForPolygonsConnectivity(SALOME_MED::medConnectivity, SALOME_MED::medEntityMesh) {return SALOME::SenderInt::_nil();}
+        SALOME::SenderInt_ptr getSenderForPolygonsConnectivityIndex(SALOME_MED::medConnectivity, SALOME_MED::medEntityMesh) {return SALOME::SenderInt::_nil();}
+        SALOME::SenderInt_ptr getSenderForPolyhedronConnectivity(SALOME_MED::medConnectivity) {return SALOME::SenderInt::_nil();}
+        SALOME::SenderInt_ptr getSenderForPolyhedronIndex(SALOME_MED::medConnectivity) {return SALOME::SenderInt::_nil();}
+        SALOME::SenderInt_ptr getSenderForPolyhedronFacesIndex() {return SALOME::SenderInt::_nil();}
+       
        char *getName() throw(SALOME::SALOME_Exception);
        CORBA::Long getSpaceDimension() throw(SALOME::SALOME_Exception);
 
@@ -216,6 +222,8 @@ class SMESH_MEDMesh_i:
         SALOME_MED::MESH::meshInfos * getMeshGlobal()
          throw (SALOME::SALOME_Exception);
 
+       bool areEquals(SALOME_MED::MESH_ptr other) { return false;};
+
         SALOME_MED::MESH::coordinateInfos * getCoordGlobal()
          throw (SALOME::SALOME_Exception);