diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-12 08:32:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-12 08:32:34 +0200 |
commit | fe03724176dcfd20e0f9a6e493198469242be6b6 (patch) | |
tree | 2245c24a6c4ef9c7d4010d1b61827850592777a3 /TAO/tao/Strategies | |
parent | 41a1f3bc12f780cc087c936ab53d1074f363b630 (diff) | |
parent | 00b403be7df0442405bd5e3dcc07beaa6730ddd2 (diff) | |
download | ATCD-fe03724176dcfd20e0f9a6e493198469242be6b6.tar.gz |
Merge pull request #1922 from knutpett/knutpett/whitespace
Remove whitespace
Diffstat (limited to 'TAO/tao/Strategies')
33 files changed, 0 insertions, 76 deletions
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.h b/TAO/tao/Strategies/COIOP_Acceptor.h index 97be5c0184f..ce27fb3d841 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.h +++ b/TAO/tao/Strategies/COIOP_Acceptor.h @@ -79,7 +79,6 @@ public: //@} protected: - /// Parse protocol specific options. virtual int parse_options (const char *options); @@ -95,7 +94,6 @@ protected: TAO_MProfile &mprofile, CORBA::Short priority); protected: - /** * Cache the information about the endpoints serviced by this * acceptor. diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h index 9873329de74..03502b6bcd3 100644 --- a/TAO/tao/Strategies/COIOP_Connector.h +++ b/TAO/tao/Strategies/COIOP_Connector.h @@ -68,7 +68,6 @@ public: //@} protected: - /** * @name More TAO_Connector Methods * @@ -88,7 +87,6 @@ protected: int cancel_svc_handler (TAO_Connection_Handler * svc_handler); private: - /// Return the remote endpoint, a helper function TAO_COIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); }; diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h index 85038ff65b5..0aabff5005c 100644 --- a/TAO/tao/Strategies/COIOP_Profile.h +++ b/TAO/tao/Strategies/COIOP_Profile.h @@ -76,7 +76,6 @@ public: void add_endpoint (TAO_COIOP_Endpoint *endp); protected: - /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string); @@ -85,7 +84,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h index a4d76e3b278..98a42fc419e 100644 --- a/TAO/tao/Strategies/COIOP_Transport.h +++ b/TAO/tao/Strategies/COIOP_Transport.h @@ -63,7 +63,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); @@ -101,7 +100,6 @@ public: ACE_Time_Value *max_time_wait = 0); private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_COIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index bd64aee4f6d..41d02ece9d6 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -112,7 +112,6 @@ public: char *&host); protected: - /** * Helper method * Clear out 'addr' & 'specified_hostname' and initialize them based @@ -173,7 +172,6 @@ protected: TAO_MProfile &mprofile, CORBA::Short priority); protected: - /// Array of ACE_INET_Addr instances, each one corresponding to a /// given network interface. ACE_INET_Addr *addrs_; @@ -214,7 +212,6 @@ protected: private: // @@ Frank: From DIOP_Acceptor.h TAO_DIOP_Connection_Handler *connection_handler_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index a4513c1dc8c..b902b1f1b6e 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -107,7 +107,6 @@ public: CORBA::UShort port (CORBA::UShort p); private: - /// Helper method for setting INET_Addr. int set (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses); diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index b362e145a27..d72faabb28b 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -438,7 +438,6 @@ TAO_DIOP_Profile::to_string () const digits [this->version_.minor], endp->host (), endp->port ()); - } ACE_OS::sprintf (buf + ACE_OS::strlen (buf), "%c%s", diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index 1946349b1e8..a9541717e1a 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -87,7 +87,6 @@ public: void add_endpoint (TAO_DIOP_Endpoint *endp); protected: - /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string); @@ -96,7 +95,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index bce523006bb..2b8563a6f09 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -67,7 +67,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); @@ -100,7 +99,6 @@ public: ACE_Time_Value *max_time_wait = 0); private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_DIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index 279a6783848..d95d4108d6f 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -72,7 +72,6 @@ protected: - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 656d238970b..1f1a862d93e 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -125,7 +125,6 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint } - // at this point, we do not have an existing transport, so we must // reset the profile list and try establishing connections via the // connector(s). diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h index ddff6b17932..7a01714c86f 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h @@ -60,7 +60,6 @@ public: virtual void select_endpoint (TAO::Profile_Transport_Resolver *, ACE_Time_Value *max_wait_time); private: - int check_profile (TAO_Profile *, TAO::Profile_Transport_Resolver *); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index c5264f5d01e..49819d0f4eb 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -215,7 +215,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, const char *address, const char *options) { - this->orb_core_ = orb_core; if (this->hosts_ != 0) @@ -274,7 +273,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, size_t hostname_length = 0; if (port_separator_loc != 0) { - // Port separator was found. Check that the next character is // not the terminator. const char *port_loc = port_separator_loc; @@ -297,9 +295,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Set the length of the hostname hostname_length = port_separator_loc - address; - } else { - // Port separator was not found. We allow port_number to retain // the value of 0, which will cause the port to be chosen for us // in open_i. @@ -359,7 +355,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, size_t i = 0; ACE_INET_Addr temp_addr; while (i < num_secondary_ip_addrs) { - // Obtain a char* for a single secondary hostname. ACE_CString & hostname_obj = hostnames[i + 1]; ACE_Auto_Basic_Array_Ptr<char> hostname_auto(hostname_obj.rep()); @@ -408,7 +403,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Set cached hostnames. i = 0; while (i < hostnames.size()) { - // The hostname_in_ior_ field may override the FIRST hostname only. if (this->hostname_in_ior_ != 0 && i == 0) { @@ -806,7 +800,6 @@ int TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames, ACE_Array<ACE_CString> &hostnames_out) { - // Make a copy of hostnames string int const hostnames_string_length = std::strlen(hostnames) + 1; char* hostnames_copy = 0; @@ -828,7 +821,6 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames, // Set the size of the array to the number of hostnames if (hostnames_out.size(num_hostnames) == -1) { - TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Could not allocate storage ") ACE_TEXT ("for %d hostnames in SCIOP endpoint\n"), diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index 43aa383c072..6bf3e96aeca 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -161,7 +161,6 @@ protected: CORBA::Short priority); protected: - /// Array of ACE_INET_Addr instances, each one corresponding to a /// given network interface. ACE_INET_Addr *addrs_; diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index c538040a969..463ca2f9dc0 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -421,7 +421,6 @@ TAO_SCIOP_Connection_Handler::set_tos (int tos) // On successful setting of TOS field. if (result == 0) this->dscp_codepoint_ = tos; - } return 0; diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index 450c9c1abc3..0871585888b 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -57,9 +57,7 @@ class TAO_Strategies_Export TAO_SCIOP_Connection_Handler : public TAO_SCIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: - TAO_SCIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. @@ -106,7 +104,6 @@ public: int set_dscp_codepoint (CORBA::Long dscp); protected: - /// Helper method needed by the set_dscp_codepoint () methods int set_tos (int tos); @@ -120,7 +117,6 @@ protected: //@} private: - /// Stores the type of service value. int dscp_codepoint_; }; diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index ee026db87bc..d3da4648cec 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -64,7 +64,6 @@ public: virtual char object_key_delimiter () const; public: - typedef TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler> TAO_SCIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -80,7 +79,6 @@ public: TAO_SCIOP_BASE_CONNECTOR; protected: - // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h int set_validate_endpoint (TAO_Endpoint *ep); @@ -97,7 +95,6 @@ protected: int cancel_svc_handler (TAO_Connection_Handler * svc_handler); private: - /// Return the remote endpoint, a helper function TAO_SCIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); @@ -108,7 +105,6 @@ private: TAO_SCIOP_Endpoint *sciop_endpoint); private: - /// Our connect strategy TAO_SCIOP_CONNECT_STRATEGY connect_strategy_; diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 6bfe2f751fc..b4498b45e7f 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -110,7 +110,6 @@ public: const char *preferred_network () const; private: - /// Helper method for setting INET_Addr. int set (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses); diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index d644f758d3b..c13e6606563 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -84,7 +84,6 @@ public: void add_endpoint (TAO_SCIOP_Endpoint *endp); protected: - /// Template methods. Please see Profile.h for the documentation. virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); @@ -93,7 +92,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index 6b954f83bce..29258a9b221 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -46,13 +46,11 @@ class TAO_Acceptor; class TAO_Strategies_Export TAO_SCIOP_Transport : public TAO_Transport { public: - /// Constructor. TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core); protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -66,7 +64,6 @@ protected: * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual ssize_t send (iovec *iov, int iovcnt, @@ -103,7 +100,6 @@ public: //@} private: - /// Set the Bidirectional context info in the service context list void set_bidir_context_info (TAO_Operation_Details &opdetails); @@ -113,7 +109,6 @@ private: int get_listen_point (IIOP::ListenPointList &listen_point_list, TAO_Acceptor *acceptor); private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_SCIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index b8d6247b732..fd87499568d 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -43,7 +43,6 @@ class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler : public TAO_SHMIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: /// Constructor. TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0); @@ -85,7 +84,6 @@ public: int add_transport_to_cache (void); protected: - //@{ /** * @name TAO_Connection Handler overloads @@ -93,7 +91,6 @@ protected: virtual int release_os_resources (void); virtual int handle_write_ready (const ACE_Time_Value *timeout); //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index b2d802d7dc7..f9e42ff4e95 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -72,7 +72,6 @@ public: //@} public: - typedef TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -107,12 +106,10 @@ protected: //@} private: - /// Return the remote endpoint, a helper function TAO_SHMIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); private: - /// Local address. ACE_MEM_Addr address_; diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index fdf1f24a4b7..84294c9b455 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -87,7 +87,6 @@ public: void add_endpoint (TAO_SHMIOP_Endpoint *endp); protected: - /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string); @@ -96,7 +95,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); private: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 70834ff1af1..c75de9b6f65 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -263,7 +263,6 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, } - int TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index a03ed6361c4..eb52a8f8a7e 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -50,7 +50,6 @@ typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH> class TAO_Strategies_Export TAO_SHMIOP_Transport : public TAO_Transport { public: - /// Constructor. TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core); diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 2216712d8a4..c2b7cb5287b 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -55,7 +55,6 @@ TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key, return this->create_shared_profile (object_key, mprofile, priority); - } int diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index fd8079e5121..8e0b92a8e9c 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -43,9 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Strategies_Export TAO_UIOP_Connection_Handler : public TAO_UIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: - TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. @@ -82,7 +80,6 @@ public: int add_transport_to_cache (void); protected: - //@{ /** * @name TAO_Connection Handler overloads diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index c16b3a412fb..88be6638ccd 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -45,7 +45,6 @@ class TAO_Endpoint; class TAO_Strategies_Export TAO_UIOP_Connector : public TAO_Connector { public: - /** * Constructor. * @@ Do we want to pass in the tag here or should it be statically @@ -78,7 +77,6 @@ public: //@} public: - typedef TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -94,7 +92,6 @@ public: TAO_UIOP_BASE_CONNECTOR; protected: - /** * @name More TAO_Connector methods * @@ -112,12 +109,10 @@ protected: //@} private: - /// Return the remote endpoint, a helper function TAO_UIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); private: - /// Our connect strategy TAO_UIOP_CONNECT_STRATEGY connect_strategy_; diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index f1d99a76ec7..72cc3e777f8 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -78,7 +78,6 @@ public: const char *rendezvous_point () const; private: - /// Cached instance of <ACE_UNIX_Addr> for use in making /// invocations, etc. ACE_UNIX_Addr object_addr_; diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index baa42e7b683..645fb892ee7 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -86,7 +86,6 @@ public: void add_endpoint (TAO_UIOP_Endpoint *endp); protected: - /// Protected template methods. Please see documentation in /// Profile.h for details. virtual int decode_profile (TAO_InputCDR& cdr); diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 9e1454efb2f..8441cb44d95 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -48,7 +48,6 @@ typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH> class TAO_Strategies_Export TAO_UIOP_Transport : public TAO_Transport { public: - /// Constructor. TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core); @@ -62,7 +61,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); @@ -93,7 +91,6 @@ public: //@} private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_UIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 0abba74c236..3dc066cece3 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -43,7 +43,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void) { - TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory"); ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory); @@ -134,7 +133,6 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) ACE_TEXT("TAO_Advanced_Resource_Factory::init - ") ACE_TEXT("-ORBReactorRegistry no longer supported\n")), -1); - } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorLock")))) @@ -377,7 +375,6 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) #endif /* TAO_HAS_COIOP && TAO_HAS_COIOP != 0 */ return 0; - } for (; factory != end; factory++) @@ -406,7 +403,6 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) } - TAO_ProtocolFactorySet * TAO_Advanced_Resource_Factory::get_protocol_factories (void) { diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index e09dd3c0038..cd4bc8ba001 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -98,7 +98,6 @@ public: virtual TAO_LF_Strategy *create_lf_strategy (void); protected: - /// Obtain the reactor implementation virtual ACE_Reactor_Impl *allocate_reactor_impl () const; @@ -127,7 +126,6 @@ protected: Allocator_Lock_Type ami_response_handler_allocator_lock_type_; virtual int load_default_protocols (void); - }; static TAO_Resource_Factory_Changer TAO_changer; |