From 70c382acbd46b2d8e448bf17fd537833dafed8ec Mon Sep 17 00:00:00 2001 From: smh Date: Wed, 8 Jun 2005 06:58:18 +0000 Subject: [PATCH] SMH: Come back correct modifications --- src/SMESH_I/SMESH_MEDFamily_i.hxx | 8 ++++---- src/SMESH_I/SMESH_MEDMesh_i.hxx | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx index 58116ae9e..e60379c04 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: - virtual public POA_SALOME_MED::FAMILY, - virtual public SMESH_MEDSupport_i + public POA_SALOME_MED::FAMILY, + public SMESH_MEDSupport_i { protected : SMESH_MEDFamily_i(); @@ -61,8 +61,8 @@ public : // IDL Methods void setProtocol(SALOME::TypeOfCommunication typ) {} void release() {} - SALOME::Sender_ptr getSenderForNumber(long int) {return SALOME::Sender::_nil();} - SALOME::Sender_ptr getSenderForNumberIndex() {return SALOME::Sender::_nil();} + SALOME::SenderInt_ptr getSenderForNumber(long int) {return SALOME::SenderInt::_nil();} + SALOME::SenderInt_ptr getSenderForNumberIndex() {return SALOME::SenderInt::_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 ee482b0c8..3e8fe7a35 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.hxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx @@ -29,7 +29,6 @@ #include #include CORBA_SERVER_HEADER(MED) -#include CORBA_SERVER_HEADER(SALOME_Comm) #include #include #include @@ -44,8 +43,8 @@ class SMESH_Mesh_i; -class SMESH_MEDMesh_i: virtual public POA_SALOME_MED::MESH, - virtual public PortableServer::RefCountServantBase +class SMESH_MEDMesh_i: + public POA_SALOME_MED::MESH, public PortableServer::RefCountServantBase { public: private: protected: // C++ object containing values @@ -78,8 +77,8 @@ class SMESH_MEDMesh_i: virtual public POA_SALOME_MED::MESH, // 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();} char *getName() throw(SALOME::SALOME_Exception); CORBA::Long getSpaceDimension() throw(SALOME::SALOME_Exception); -- 2.30.2