- removing deprecated method

diff --git a/salome_adm/unix/config_files/check_openmpi.m4 b/salome_adm/unix/config_files/check_openmpi.m4
index 24673dde65e7a4860cb80e25c8b2ee8f5436b476..03f3378fdd1730f4ac2be3e2953b0228a836f381 100644 (file)
--- 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 70216b465d724753e3b3558a021ab4401bf649b3..e67b38dffd5b4ed070dc82295b5fd5f3534fbf64 100644 (file)
--- 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 7a28693b69c6b47b39cde679509d9c450ad7c3aa..abe8f8e7c04f0f53b6124e3c93c2e1ec17dfe1c2 100644 (file)
--- 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 8d186c50914730b934175cfbd0a74f2d23570d98..f6f0ce9128cf8bc981aa7d87c4e2cc638c72fbb2 100644 (file)
--- 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 <typename TimeType,typename TagType>
   void  put(CorbaInDataType data,  TimeType time, TagType tag); 
 
@@ -82,24 +81,6 @@ GenericUsesPort< DataManipulator,CorbaPortType, repositoryName, UsesPort  >::get
 }
 
 
-template <typename DataManipulator,typename CorbaPortType, char * repositoryName, typename UsesPort > 
-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 <typename DataManipulator,typename CorbaPortType, char * repositoryName, typename UsesPort > 
 template <typename TimeType,typename TagType>
 void

diff --git a/src/DSC/DSC_User/uses_port.hxx b/src/DSC/DSC_User/uses_port.hxx
index 9409219892ead1d193a5b59c2292e24e5ce731fc..5c33f094f666fa16aa38a5d3c363d9f9e9bc8ac7 100644 (file)
--- 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.