From 77f8adcad5138a8880d692e9cb123bbf9586f89b Mon Sep 17 00:00:00 2001 From: ribes Date: Wed, 24 Oct 2007 13:54:23 +0000 Subject: [PATCH] - removing deprecated method --- salome_adm/unix/config_files/check_openmpi.m4 | 2 +- .../DSC_User/Basic/data_short_port_uses.cxx | 6 ------ .../DSC_User/Basic/data_short_port_uses.hxx | 6 ------ .../DSC_User/Datastream/GenericUsesPort.hxx | 19 ------------------- src/DSC/DSC_User/uses_port.hxx | 8 -------- 5 files changed, 1 insertion(+), 40 deletions(-) diff --git a/salome_adm/unix/config_files/check_openmpi.m4 b/salome_adm/unix/config_files/check_openmpi.m4 index 24673dde6..03f3378fd 100644 --- a/salome_adm/unix/config_files/check_openmpi.m4 +++ b/salome_adm/unix/config_files/check_openmpi.m4 @@ -22,7 +22,7 @@ dnl AC_DEFUN([CHECK_OPENMPI],[ AC_ARG_WITH(openmpi, - AC_HELP_STRING([--with-openmpi],[root directory path of openmpi installation]), + AC_HELP_STRING([--with-openmpi=DIR],[root directory path of openmpi installation]), WITHOPENMPI="yes",WITHOPENMPI="no") MPI_INCLUDES="" diff --git a/src/DSC/DSC_User/Basic/data_short_port_uses.cxx b/src/DSC/DSC_User/Basic/data_short_port_uses.cxx index 70216b465..e67b38dff 100644 --- a/src/DSC/DSC_User/Basic/data_short_port_uses.cxx +++ b/src/DSC/DSC_User/Basic/data_short_port_uses.cxx @@ -28,7 +28,6 @@ using namespace std; data_short_port_uses::data_short_port_uses() { - _my_port = Ports::Data_Short_Port::_nil(); _my_ports = NULL; } @@ -39,11 +38,6 @@ data_short_port_uses::get_repository_id() { return "IDL:Ports/Data_Short_Port:1.0"; } -bool -data_short_port_uses::set_port(Ports::Port_ptr port) { - _my_port = Ports::Data_Short_Port::_narrow(port); -} - void data_short_port_uses::put(CORBA::Short data) { // if (!CORBA::is_nil(_my_port)) diff --git a/src/DSC/DSC_User/Basic/data_short_port_uses.hxx b/src/DSC/DSC_User/Basic/data_short_port_uses.hxx index 7a28693b6..abe8f8e7c 100644 --- a/src/DSC/DSC_User/Basic/data_short_port_uses.hxx +++ b/src/DSC/DSC_User/Basic/data_short_port_uses.hxx @@ -48,11 +48,6 @@ class data_short_port_uses : */ virtual const char * get_repository_id(); - /*! - * \warning deprecated - */ - virtual bool set_port(Ports::Port_ptr port); - /*! * This method is used by the component to send * a short value to all the provides ports connected. @@ -72,7 +67,6 @@ class data_short_port_uses : const Engines::DSC::Message message); private : - Ports::Data_Short_Port_ptr _my_port; Engines::DSC::uses_port * _my_ports; }; diff --git a/src/DSC/DSC_User/Datastream/GenericUsesPort.hxx b/src/DSC/DSC_User/Datastream/GenericUsesPort.hxx index 8d186c509..f6f0ce912 100644 --- a/src/DSC/DSC_User/Datastream/GenericUsesPort.hxx +++ b/src/DSC/DSC_User/Datastream/GenericUsesPort.hxx @@ -55,7 +55,6 @@ public : virtual ~GenericUsesPort(); virtual const char * get_repository_id(); - virtual bool set_port(Ports::Port_ptr port); template void put(CorbaInDataType data, TimeType time, TagType tag); @@ -82,24 +81,6 @@ GenericUsesPort< DataManipulator,CorbaPortType, repositoryName, UsesPort >::get } -template -bool -GenericUsesPort< DataManipulator,CorbaPortType, repositoryName, UsesPort >::set_port(Ports::Port_ptr port) { - if (_my_ports) { - size_t n = _my_ports->length()+1; - _my_ports->length(n); - (*_my_ports)[n]=CorbaPortType::_narrow(port); - return true; - } else { - // VĂ©rifier si port is_nil - _my_ports = new Engines::DSC::uses_port(); - _my_ports->length(1); - (*_my_ports)[0]=CorbaPortType::_narrow(port); - return true; - } - return false; -} - template template void diff --git a/src/DSC/DSC_User/uses_port.hxx b/src/DSC/DSC_User/uses_port.hxx index 940921989..5c33f094f 100644 --- a/src/DSC/DSC_User/uses_port.hxx +++ b/src/DSC/DSC_User/uses_port.hxx @@ -53,14 +53,6 @@ class uses_port : public base_port */ virtual const char * get_repository_id() = 0; - /*! - * DEPRECATED --- WILL BE REMOVED - * It was used when uses port where not multiple. - * It's an abstract method. - * - */ - virtual bool set_port(Ports::Port_ptr port) = 0; - /*! * This method is the uses port's callback to be aware of * connections states. -- 2.39.2