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 ee482b0c8bef658092638f5c9799fe2e2b451727..3b0fedec9c9c338bbe8ce1e85893e5061603d405 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -29,7 +29,6 @@
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MED)
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MED)

-#include CORBA_SERVER_HEADER(SALOME_Comm)

 #include <string>
 #include <vector>
 #include <map>
 #include <string>
 #include <vector>
 #include <map>


@@ -38,14 +37,15 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"

+#include "SALOME_GenericObj_i.hh"

 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5
 
 class SMESH_Mesh_i;
 
 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5
 
 class SMESH_Mesh_i;
 

-class SMESH_MEDMesh_i: virtual public POA_SALOME_MED::MESH, 
-                      virtual public PortableServer::RefCountServantBase
+class SMESH_MEDMesh_i:
+       public virtual POA_SALOME_MED::MESH, public virtual SALOME::GenericObj_i

 {
   public: private: protected:
        // C++ object containing values
 {
   public: private: protected:
        // C++ object containing values


@@ -78,8 +78,13 @@ class SMESH_MEDMesh_i: virtual public POA_SALOME_MED::MESH,
        // IDL Methods
        void setProtocol(SALOME::TypeOfCommunication typ) {}
        void release() {}
        // 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);
        
        char *getName() throw(SALOME::SALOME_Exception);
        CORBA::Long getSpaceDimension() throw(SALOME::SALOME_Exception);