diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | TAO/tao/Acceptor_Registry.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.h | 3 | ||||
| -rw-r--r-- | TAO/tao/UIOP_Acceptor.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/UIOP_Acceptor.h | 2 |
6 files changed, 23 insertions, 14 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index e65a8ed4d5f..0132b9a9cde 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Sun Aug 27 13:09:38 2000 Marina Spivak <marina@cs.wustl.edu> + + * tao/UIOP_Acceptor.{h,cpp} + * tao/IIOP_Acceptor.{h,cpp}: + + Removed ORB_Core parameter from <open_i> method, since it was + not being used. + + * tao/Acceptor_Registry.cpp (make_mprofile): + + Added ACE_UNUSED_ARG. + Sat Aug 26 23:07:56 2000 Marina Spivak <marina@cs.wustl.edu> * tao/Policy_Manager.i diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 1105462ae07..04deb6a9bee 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -90,6 +90,8 @@ TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key, #else /* TAO_HAS_RT_CORBA == 1 */ + ACE_UNUSED_ARG (poa); + for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i) if ((*i)->create_mprofile (object_key, mprofile) == -1) diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index c72f78d897f..5733663fcb5 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -206,7 +206,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, 1) != 0) return -1; else - return this->open_i (orb_core, addr); + return this->open_i (addr); } else if (ACE_OS::strchr (address, ':') == 0) { @@ -240,7 +240,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, if (this->addrs_[0].set (addr) != 0) return -1; - return this->open_i (orb_core, addr); + return this->open_i (addr); } int @@ -289,13 +289,11 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, 1) != 0) return -1; - return this->open_i (orb_core, - addr); + return this->open_i (addr); } int -TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, - const ACE_INET_Addr& addr) +TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr) { ACE_NEW_RETURN (this->creation_strategy_, TAO_IIOP_CREATION_STRATEGY (this->orb_core_, diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 9fa02f0c9d0..666fcf5315e 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -81,8 +81,7 @@ public: virtual int object_key (IOP::TaggedProfile &profile, TAO_ObjectKey &key); private: - int open_i (TAO_ORB_Core *orb_core, - const ACE_INET_Addr &addr); + int open_i (const ACE_INET_Addr &addr); // Implement the common part of the open*() methods. int hostname (TAO_ORB_Core *orb_core, diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp index 026de130d3e..3684f9913b5 100644 --- a/TAO/tao/UIOP_Acceptor.cpp +++ b/TAO/tao/UIOP_Acceptor.cpp @@ -185,7 +185,7 @@ TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core, if (this->parse_options (options) == -1) return -1; else - return this->open_i (orb_core, address); + return this->open_i (address); } int @@ -215,13 +215,11 @@ TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, if (tempname.get () == 0) return -1; - return this->open_i (orb_core, - tempname.get ()); + return this->open_i (tempname.get ()); } int -TAO_UIOP_Acceptor::open_i (TAO_ORB_Core *orb_core, - const char *rendezvous) +TAO_UIOP_Acceptor::open_i (const char *rendezvous) { ACE_NEW_RETURN (this->creation_strategy_, TAO_UIOP_CREATION_STRATEGY (this->orb_core_, diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h index 8e93afb59f0..480dcd206b7 100644 --- a/TAO/tao/UIOP_Acceptor.h +++ b/TAO/tao/UIOP_Acceptor.h @@ -80,7 +80,7 @@ public: virtual int object_key (IOP::TaggedProfile &profile, TAO_ObjectKey &key); private: - int open_i (TAO_ORB_Core *orb_core, const char *rendezvous); + int open_i (const char *rendezvous); // Implement the common part of the open*() methods void rendezvous_point (ACE_UNIX_Addr &, const char *rendezvous); |