remove adjusting pointers for covariant returns

[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 3e8fe7a35f49d93fbea05a845c2d709ecd4eae39..ee482b0c8bef658092638f5c9799fe2e2b451727 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -29,6 +29,7 @@
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MED)
+#include CORBA_SERVER_HEADER(SALOME_Comm)
 #include <string>
 #include <vector>
 #include <map>
@@ -43,8 +44,8 @@
 
 class SMESH_Mesh_i;
 
-class SMESH_MEDMesh_i:
-       public POA_SALOME_MED::MESH, public PortableServer::RefCountServantBase
+class SMESH_MEDMesh_i: virtual public POA_SALOME_MED::MESH, 
+                      virtual public PortableServer::RefCountServantBase
 {
   public: private: protected:
        // C++ object containing values
@@ -77,8 +78,8 @@ class SMESH_MEDMesh_i:
        // IDL Methods
        void setProtocol(SALOME::TypeOfCommunication typ) {}
        void release() {}
-       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::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();}
        
        char *getName() throw(SALOME::SALOME_Exception);
        CORBA::Long getSpaceDimension() throw(SALOME::SALOME_Exception);