From aff9140a3afcfe2b8d179977716dd5e0ce36fdae Mon Sep 17 00:00:00 2001 From: bala Date: Tue, 16 Apr 2002 04:02:33 +0000 Subject: ChangeLogTag:Mon Apr 15 23:13:23 2002 Balachandran Natarajan --- TAO/ChangeLogs/ChangeLog-02a | 21 +++++++++++++++++++++ .../orbsvcs/PortableGroup/UIPMC_Connector.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h | 4 ++-- TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp | 2 +- TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h | 5 +++-- TAO/tao/IIOP_Connector.cpp | 4 ++-- TAO/tao/IIOP_Connector.h | 4 ++-- TAO/tao/Strategies/DIOP_Connector.cpp | 4 ++-- TAO/tao/Strategies/DIOP_Connector.h | 6 +++--- TAO/tao/Strategies/SHMIOP_Connector.cpp | 4 ++-- TAO/tao/Strategies/SHMIOP_Connector.h | 6 +++--- TAO/tao/Strategies/UIOP_Connector.cpp | 4 ++-- TAO/tao/Strategies/UIOP_Connector.h | 6 +++--- TAO/tao/Transport_Connector.cpp | 4 ++-- TAO/tao/Transport_Connector.h | 4 ++-- 15 files changed, 52 insertions(+), 30 deletions(-) diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c1f7aa6787f..31dde212c25 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,24 @@ +Mon Apr 15 23:13:23 2002 Balachandran Natarajan + + * tao/Transport_Connector.h: + * tao/Transport_Connector.cpp: Changed the name of the method + make_connect () as make_connection (), since the latter + indicated what it was doing. + + * tao/IIOP_Connector.cpp (make_connection): + * tao/IIOP_Connector.h: + * tao/Strategies/SHMIOP_Connector.h: + * tao/Strategies/SHMIOP_Connector.cpp: + * tao/Strategies/UIOP_Connector.h: + * tao/Strategies/UIOP_Connector.cpp: + * tao/Strategies/DIOP_Connector.h: + * tao/Strategies/DIOP_Connector.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: Changed the + method name mentioned above in all the implementations. + Mon Apr 15 22:19:31 2002 Balachandran Natarajan * tao/Incoming_Message_Queue.h: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 46122dd69d8..9a0636e0bb3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -86,8 +86,8 @@ TAO_UIPMC_Connector::close (void) } int -TAO_UIPMC_Connector::make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) +TAO_UIPMC_Connector::make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) { TAO_Transport *&transport = invocation->transport (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 019292db342..9b49f16702a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -63,8 +63,8 @@ public: protected: /// = More TAO_Connector methods, please check the documentation on /// TAO_Connector.h - int make_connect(TAO_GIOP_Invocation *, - TAO_Transport_Descriptor_Interface *); + int make_connection (TAO_GIOP_Invocation *, + TAO_Transport_Descriptor_Interface *); virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 1318cedba87..0618489ee51 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -116,7 +116,7 @@ TAO_IIOP_SSL_Connector::close (void) } int -TAO_IIOP_SSL_Connector::make_connect ( +TAO_IIOP_SSL_Connector::make_connection ( TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc) { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index ba9ddcd89c2..589eff28c1c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -70,8 +70,9 @@ public: TAO_IIOP_SSL_BASE_CONNECTOR; protected: - int make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc); + + int make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc); private: diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 7f8ca4e55ce..d4a40dd7424 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -100,8 +100,8 @@ TAO_IIOP_Connector::close (void) } int -TAO_IIOP_Connector::make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) +TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) { ACE_Time_Value *max_wait_time = invocation->max_wait_time (); TAO_Endpoint *endpoint = desc->endpoint (); diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index da69ea9e24d..ffc5c8f119b 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -65,8 +65,8 @@ public: protected: // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h - int make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc); + int make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc); /// More TAO_Connector methods, please check the documentation on /// Transport_Connector.h diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index f28e087cfd5..0bc75148a9a 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -93,8 +93,8 @@ TAO_DIOP_Connector::close (void) } int -TAO_DIOP_Connector::make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) +TAO_DIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) { TAO_Transport *&transport = invocation->transport (); diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 35c9ea6f73c..7fa1a059216 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -62,9 +62,9 @@ public: protected: /// = More TAO_Connector methods, please check the documentation on - /// Pluggable.h - int make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc); + /// Transport_Acceptor.h + int make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc); virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 0b7dd818d6a..67d2b604eef 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -113,8 +113,8 @@ TAO_SHMIOP_Connector::close (void) } int -TAO_SHMIOP_Connector::make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) +TAO_SHMIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index fce2a5e587e..a887a06796e 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -67,9 +67,9 @@ public: protected: // = More TAO_Connector methods, please check the documentation on - // Pluggable.h - int make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc); + // Transport_Connector.h + int make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc); virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index d86e4e509cb..d6f0eabed73 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -107,8 +107,8 @@ TAO_UIOP_Connector::close (void) int -TAO_UIOP_Connector::make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) +TAO_UIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 3a4d3e4311d..c62913e2344 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -75,11 +75,11 @@ protected: /** * @name More TAO_Connector methods * - * Please check the documentation in Pluggable.h. + * Please check the documentation in Transport_Connector.h. */ //@{ - int make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc); + int make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc); virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 6cb3dc997bd..429a493efcc 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -231,6 +231,6 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation, return 0; } - return this->make_connect (invocation, - desc); + return this->make_connection (invocation, + desc); } diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 9773a82f756..b34fedbf461 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -103,8 +103,8 @@ protected: /// Do an actual connect using the underlying transport to make a /// connection - virtual int make_connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) = 0; + virtual int make_connection (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) = 0; /// Set the ORB Core pointer void orb_core (TAO_ORB_Core *orb_core); -- cgit v1.2.1