From 4679b8437be95e08b09e23f9d9069f3d18f4a754 Mon Sep 17 00:00:00 2001 From: apo Date: Wed, 8 Jun 2005 04:59:17 +0000 Subject: [PATCH] remove adjusting pointers for covariant returns --- src/SMESH_I/SMESH_MEDFamily_i.hxx | 8 ++++---- src/SMESH_I/SMESH_MEDMesh_i.hxx | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx index e60379c04..58116ae9e 100644 --- a/src/SMESH_I/SMESH_MEDFamily_i.hxx +++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx @@ -32,8 +32,8 @@ #include class SMESH_MEDFamily_i: - public POA_SALOME_MED::FAMILY, - public SMESH_MEDSupport_i + virtual public POA_SALOME_MED::FAMILY, + virtual public SMESH_MEDSupport_i { protected : SMESH_MEDFamily_i(); @@ -61,8 +61,8 @@ public : // IDL Methods void setProtocol(SALOME::TypeOfCommunication typ) {} void release() {} - SALOME::SenderInt_ptr getSenderForNumber(long int) {return SALOME::SenderInt::_nil();} - SALOME::SenderInt_ptr getSenderForNumberIndex() {return SALOME::SenderInt::_nil();} + SALOME::Sender_ptr getSenderForNumber(long int) {return SALOME::Sender::_nil();} + SALOME::Sender_ptr getSenderForNumberIndex() {return SALOME::Sender::_nil();} CORBA::Long getIdentifier() throw (SALOME::SALOME_Exception); diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx index 3e8fe7a35..ee482b0c8 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.hxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx @@ -29,6 +29,7 @@ #include #include CORBA_SERVER_HEADER(MED) +#include CORBA_SERVER_HEADER(SALOME_Comm) #include #include #include @@ -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); -- 2.30.2