diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
| commit | 25496e24b8043b7b515b3f8beb8e453fb105211c (patch) | |
| tree | f1b34a170ac61e90a3eb102b879e9d51d10336bc /TAO/tao/Strategies | |
| parent | fa92d4711fb7519995b6bb9e5a16016d7326bbb0 (diff) | |
| download | ATCD-25496e24b8043b7b515b3f8beb8e453fb105211c.tar.gz | |
This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_merge_in_4_14_06
'oci_wchar_refactor_merge_in_4_14_06'.
Diffstat (limited to 'TAO/tao/Strategies')
86 files changed, 301 insertions, 1220 deletions
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 2e527cea8ec..771ed508113 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -1,11 +1,11 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/DIOP_Acceptor.h" +#include "DIOP_Acceptor.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/debug.h" @@ -17,7 +17,7 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "tao/Strategies/DIOP_Acceptor.i" +#include "DIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" @@ -26,8 +26,6 @@ ACE_RCSID (Strategies, DIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_DIOP_PROFILE), addrs_ (0), @@ -437,7 +435,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN (this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -615,8 +613,7 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile, profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ - CORBA::Octet major; - CORBA::Octet minor = CORBA::Octet(); + CORBA::Octet major, minor; // Read the version. We just read it here. We don't*do any* // processing. @@ -721,7 +718,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())), + ACE_TEXT_TO_TCHAR_IN (opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -743,13 +740,11 @@ TAO_DIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), + ACE_TEXT_TO_TCHAR_IN (name.c_str ())), -1); } } return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 0de8b911e3d..4ff200dc543 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,13 +27,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Transport_Acceptor.h" -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO DIOP_Acceptor concrete call defination /** @@ -178,10 +176,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "tao/Strategies/DIOP_Acceptor.i" +#include "DIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Acceptor.i b/TAO/tao/Strategies/DIOP_Acceptor.i index 2603d4e7156..9aaf71a3d41 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.i +++ b/TAO/tao/Strategies/DIOP_Acceptor.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr& TAO_DIOP_Acceptor::address (void) const { @@ -24,5 +21,3 @@ TAO_DIOP_Acceptor::endpoints (void) return this->addrs_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 335567bc4e1..73c80795b50 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -16,17 +16,14 @@ #include "tao/Protocols_Hooks.h" #include "tao/Resume_Handle.h" -#include "tao/Strategies/DIOP_Transport.h" -#include "tao/Strategies/DIOP_Endpoint.h" +#include "DIOP_Transport.h" +#include "DIOP_Endpoint.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" ACE_RCSID(tao, DIOP_Connect, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_DIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -157,7 +154,7 @@ TAO_DIOP_Connection_Handler::open (void*) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -") ACE_TEXT("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number ())); } @@ -168,7 +165,7 @@ TAO_DIOP_Connection_Handler::open (void*) return -1; this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -182,7 +179,7 @@ TAO_DIOP_Connection_Handler::open_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -") ACE_TEXT("listening on %s:%d\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number () )); } @@ -301,6 +298,4 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h index 74c8702113a..933a1f4254d 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -29,12 +29,9 @@ #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" -#include "tao/Strategies/DIOP_Transport.h" +#include "DIOP_Transport.h" #include "ace/SOCK_Dgram.h" -#include "tao/Strategies/strategies_export.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "strategies_export.h" // Forward Decls class TAO_Pluggable_Messaging; @@ -49,9 +46,11 @@ class TAO_Pluggable_Messaging; * The Connection handler which is common for the Acceptor and * the Connector */ -class TAO_Strategies_Export TAO_DIOP_Connection_Handler - : public TAO_DIOP_SVC_HANDLER - , public TAO_Connection_Handler + + +class TAO_Strategies_Export TAO_DIOP_Connection_Handler : + public TAO_DIOP_SVC_HANDLER, + public TAO_Connection_Handler { public: @@ -161,8 +160,6 @@ private: int dscp_codepoint_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index a2aecebc2b4..671bac804cb 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/DIOP_Connector.h" +#include "DIOP_Connector.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -15,16 +15,13 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" ACE_RCSID (Strategies, DIOP_Connector, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_DIOP_PROFILE), lite_flag_ (flag) @@ -235,11 +232,11 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) int TAO_DIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * /* svc_handler */) + TAO_Connection_Handler * svc_handler) { + ACE_UNUSED_ARG(svc_handler); + + // Noop return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index d1f8e139fbe..5cec9dbd0c8 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,14 +22,12 @@ #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) #include "tao/Transport_Connector.h" -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Endpoint; class TAO_DIOP_Endpoint; @@ -115,8 +113,6 @@ private: ACE_Null_Mutex > SvcHandlerIterator; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index 43657b6d783..f10fb9c0f7e 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -2,11 +2,11 @@ // $Id$ -#include "tao/Strategies/DIOP_Endpoint.h" +#include "DIOP_Endpoint.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -20,13 +20,11 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/DIOP_Endpoint.i" +# include "DIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) @@ -245,7 +243,4 @@ TAO_DIOP_Endpoint::object_addr (void) const } return this->object_addr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index a654c95e94a..01a932546b7 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- + //============================================================================= /** @@ -22,14 +23,14 @@ #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_DIOP_Connection_Handler; @@ -137,10 +138,8 @@ private: TAO_DIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/DIOP_Endpoint.i" +# include "DIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i index 03c7835ffbe..3bd443220b5 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.i +++ b/TAO/tao/Strategies/DIOP_Endpoint.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const char * TAO_DIOP_Endpoint::host (void) const { @@ -21,5 +18,3 @@ TAO_DIOP_Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 8c23791d31f..ef5755dde44 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/DIOP_Factory.h" +#include "DIOP_Factory.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Acceptor.h" -#include "tao/Strategies/DIOP_Connector.h" +#include "DIOP_Acceptor.h" +#include "DIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -15,9 +15,7 @@ ACE_RCSID (Strategies, DIOP_Factory, "$Id$") -static const char the_prefix[] = "diop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "diop"; TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE), @@ -34,13 +32,13 @@ int TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO_DIOP_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -94,8 +92,6 @@ TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory, ACE_TEXT ("DIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index 6add2587345..5b0313bef84 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -27,15 +27,12 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/Strategies/strategies_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "strategies_export.h" class TAO_Acceptor; class TAO_Connector; -class TAO_Strategies_Export TAO_DIOP_Protocol_Factory - : public TAO_Protocol_Factory +class TAO_Strategies_Export TAO_DIOP_Protocol_Factory : public TAO_Protocol_Factory { public: /// Constructor. @@ -76,8 +73,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_DIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 19c9432b3a0..af1c9aabad4 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -1,6 +1,7 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ - -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -19,9 +20,7 @@ ACE_RCSID (Strategies, DIOP_Profile, "$Id$") -static const char the_prefix[] = "diop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "diop"; const char TAO_DIOP_Profile::object_key_delimiter_ = '/'; @@ -297,7 +296,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) size_t buflen = (8 /* "corbaloc" */ + 1 /* colon separator */ + - ACE_OS::strlen (::the_prefix) + + ACE_OS::strlen (::prefix_) + 1 /* colon separator */ + 1 /* major version */ + 1 /* decimal point */ + @@ -315,7 +314,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@%s:%d%c%s", - ::the_prefix, + ::prefix_, digits [this->version_.major], digits [this->version_.minor], this->endpoint_.host (), @@ -329,7 +328,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_DIOP_Profile::prefix (void) { - return ::the_prefix; + return ::prefix_; } void @@ -473,6 +472,4 @@ TAO_DIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index 0458ebef6dc..e51bb10e95f 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- + //============================================================================= /** @@ -27,9 +28,8 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Strategies/DIOP_Endpoint.h" +#include "DIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO DIOP_Profile concrete Profile definitions /** @@ -122,8 +122,6 @@ protected: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 876fd01d111..a3a11e887bc 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -1,12 +1,13 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/DIOP_Transport.h" +#include "DIOP_Transport.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Connection_Handler.h" -#include "tao/Strategies/DIOP_Acceptor.h" -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Connection_Handler.h" +#include "DIOP_Acceptor.h" +#include "DIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/operation_details.h" #include "tao/Timeprobe.h" @@ -22,8 +23,6 @@ ACE_RCSID (tao, DIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -121,7 +120,7 @@ TAO_DIOP_Transport::recv (char *buf, ACE_DEBUG ((LM_DEBUG, "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n", n, - ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (from_addr.get_host_name ()), from_addr.get_port_number (), errno)); } @@ -167,7 +166,7 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh, // The buffer on the stack which will be used to hold the input // messages - char buf [ACE_MAX_DGRAM_SIZE + ACE_CDR::MAX_ALIGNMENT]; + char buf [ACE_MAX_DGRAM_SIZE]; #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) (void) ACE_OS::memset (buf, @@ -212,33 +211,21 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh, // Set the write pointer in the stack buffer message_block.wr_ptr (n); - // Make a node of the message block.. - TAO_Queued_Data qd (&message_block); - size_t mesg_length; - // Parse the incoming message for validity. The check needs to be // performed by the messaging objects. - if (this->messaging_object ()->parse_next_message (message_block, - qd, - mesg_length) == -1) + if (this->parse_incoming_messages (message_block) == -1) return -1; - if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) - { - // parse/marshal error - return -1; - } - - if (message_block.length () > mesg_length) - { - // we read too much data - return -1; - } - // NOTE: We are not performing any queueing nor any checking for // missing data. We are assuming that ALL the data would be got in a // single read. + // Make a node of the message block.. + TAO_Queued_Data qd (&message_block); + + // Extract the data for the node.. + this->messaging_object ()->get_message_data (&qd); + // Process the message return this->process_parsed_messages (&qd, rh); } @@ -345,10 +332,9 @@ int TAO_DIOP_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) { - this->messaging_object_->init (major, minor); + this->messaging_object_->init (major, + minor); return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 7313639fc96..63c79700296 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -1,5 +1,5 @@ +// This may look like C, but it's really -*- C++ -*- // -*- C++ -*- - // =================================================================== /** * @file DIOP_Transport.h @@ -27,13 +27,7 @@ #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" -#include "tao/Strategies/strategies_export.h" - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "strategies_export.h" // Forward decls. class TAO_DIOP_Connection_Handler; @@ -46,6 +40,10 @@ class TAO_Acceptor; typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> TAO_DIOP_SVC_HANDLER; +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT +template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + /** * @class TAO_DIOP_Transport * @@ -137,8 +135,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp index 4a9822dc7b5..d1e9d6940b3 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h" +#include "FIFO_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum), @@ -17,10 +14,12 @@ TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy ( { } + TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void) { } + void TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { @@ -32,4 +31,4 @@ TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport) } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h index 30ef3794a5c..b69bcff5739 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file FIFO_Connection_Purging_Strategy.h @@ -14,7 +12,7 @@ #define TAO_FIFO_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Connection_Purging_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +21,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_FIFO_Connection_Purging_Strategy * @@ -54,7 +50,5 @@ private: unsigned long order_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_FIFO_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp index eab9bc1f9e0..961ba767c8e 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "tao/Strategies/LFU_Connection_Purging_Strategy.h" +#include "LFU_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum) @@ -19,10 +16,10 @@ TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void) { } + void TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { transport->purging_order (transport->purging_order () + 1); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h index 98ea59231f9..b2b390c429f 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file LFU_Connection_Purging_Strategy.h @@ -14,7 +12,7 @@ #define TAO_LFU_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Connection_Purging_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +21,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LFU_Connection_Purging_Strategy * @@ -49,7 +45,5 @@ public: virtual void update_item (TAO_Transport* transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LFU_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp index 67c5f5e0871..d3c740cb9de 100644 --- a/TAO/tao/Strategies/LF_Strategy_Null.cpp +++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp @@ -1,16 +1,14 @@ +// -*- C++ -*- // $Id$ -#include "tao/Strategies/LF_Strategy_Null.h" +#include "LF_Strategy_Null.h" #if !defined (__ACE_INLINE__) -# include "tao/Strategies/LF_Strategy_Null.inl" +# include "LF_Strategy_Null.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, LF_Strategy_Null, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void) { } @@ -32,5 +30,3 @@ TAO_LF_Strategy_Null::reset_event_loop_thread (int, TAO_Leader_Follower &) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h index 18ba5632ad0..746204fd3d0 100644 --- a/TAO/tao/Strategies/LF_Strategy_Null.h +++ b/TAO/tao/Strategies/LF_Strategy_Null.h @@ -14,15 +14,13 @@ #define TAO_LF_STRATEGY_NULL_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/LF_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LF_Strategy_Null * @@ -50,10 +48,8 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/LF_Strategy_Null.inl" +# include "LF_Strategy_Null.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp index 181be613d77..930c9c89053 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp @@ -1,32 +1,31 @@ // $Id$ -#include "tao/Strategies/NULL_Connection_Purging_Strategy.h" +#include "NULL_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum) { } + TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (void) { } + void TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { ACE_UNUSED_ARG (transport); } + int TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const { return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h index 37b5c15d268..39804305347 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file NULL_Connection_Purging_Strategy.h @@ -14,7 +12,7 @@ #define TAO_NULL_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +21,6 @@ #include "tao/Connection_Purging_Strategy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_NULL_Connection_Purging_Strategy * @@ -49,7 +45,5 @@ public: virtual int cache_maximum (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NULL_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp deleted file mode 100644 index 96c1cf8c8b2..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// $Id$ - -#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" -#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/OS.h" - -ACE_RCSID (tao, - OC_Endpoint_Selector_Factory, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_OC_Endpoint_Selector_Factory::TAO_OC_Endpoint_Selector_Factory (void) - : oc_endpoint_selector_(0) -{ -} - -TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory (void) -{ - delete this->oc_endpoint_selector_; -} - -int -TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[]) -{ - ACE_Time_Value timeout(0,0); - - TAO_ORB_Core::set_endpoint_selector_factory ("OC_Endpoint_Selector_Factory"); - for (int count = 0; count < argc; count++) - { - if ((ACE_OS::strcasecmp (argv[count], - ACE_TEXT ("-connect_timeout")) == 0) && - count < argc-1) - { - count++; - long ms = ACE_OS::strtol(argv[count],0,10); - timeout.msec (ms); - } - } - - ACE_NEW_RETURN (this->oc_endpoint_selector_, - TAO_Optimized_Connection_Endpoint_Selector(timeout), - -1); - return 0; -} - - -TAO_Invocation_Endpoint_Selector * -TAO_OC_Endpoint_Selector_Factory::get_selector ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) -{ - // Trivial endpoint selector. Just return the default selector. - return this->oc_endpoint_selector_; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -// **************************************************************** - -ACE_STATIC_SVC_DEFINE (TAO_OC_Endpoint_Selector_Factory, - ACE_TEXT ("OC_Endpoint_Selector_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_OC_Endpoint_Selector_Factory), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) -ACE_FACTORY_DEFINE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h deleted file mode 100644 index c1cae879efb..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ /dev/null @@ -1,87 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file OC_Endpoint_Selector_Factory.h - * - * $Id$ - * - * Strategies for selecting profile/endpoint from an IOR for making an - * invocation. - * - * @author Phil Mesnier <mesnier_p@ociweb.com> - */ -//============================================================================= - - -#ifndef TAO_OC_ENDPOINT_SELECTOR_FACTORY_H -#define TAO_OC_ENDPOINT_SELECTOR_FACTORY_H -#include /**/ "ace/pre.h" - - -#include "tao/Strategies/strategies_export.h" - -#include "tao/Endpoint_Selector_Factory.h" -#include "ace/Service_Config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Forward references -class TAO_Optimized_Connection_Endpoint_Selector; - -// **************************************************************** - -/** - * @class TAO_OC_Endpoint_Selector_Factory - * - * @brief Factory for initializing <Endpoint_Selection_State> and - * obtaining appropriate <Invocation_Endpoint_Selector>. - * - * Used by Invocation classes to intialize its endpoint selection - * strategy and state based on the effective policies. - * Endpoint selection strategies are stateless objects - all the - * state they need is contained by Invocation in - * <Endpoint_Selection_State>. Thus, rather than allocating an - * endpoint selection strategy object for each Invocation, the - * factory simply returns the appropriate one from the - * set preallocated in the ORB_Core. One endpoint selection - * strategy object can be used by many invocations concurrently. - */ -class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Factory - : public TAO_Endpoint_Selector_Factory -{ -public: - /// Constructor. - TAO_OC_Endpoint_Selector_Factory (void); - - /// Destructor. - virtual ~TAO_OC_Endpoint_Selector_Factory (void); - - - virtual int init (int argc, ACE_TCHAR *argv[]); - - /// Get an Invocation's endpoint selection strategy and - /// initialize the endpoint selection state instance. - virtual TAO_Invocation_Endpoint_Selector *get_selector ( - ACE_ENV_SINGLE_ARG_DECL); - -protected: - /// The possible endpoint selector strategies that can be - /// returned by this factory - - TAO_Optimized_Connection_Endpoint_Selector *oc_endpoint_selector_; -}; - - -TAO_END_VERSIONED_NAMESPACE_DECL - - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) -ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) - -#include /**/ "ace/post.h" -#endif /* TAO_OC_ENDPOINT_SELECTOR_FACTORY_H */ diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp deleted file mode 100644 index c250cd76240..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/Strategies/OC_Endpoint_Selector_Loader.h" -#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" - -ACE_RCSID (tao, - OC_Endpoint_Selector_Loader, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_OC_Endpoint_Selector_Loader::TAO_OC_Endpoint_Selector_Loader (void) -{ -#if defined (TAO_AS_STATIC_LIBS) - ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory); -#endif /* TAO_AS_STATIC_LIBS */ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h deleted file mode 100644 index 5edc517027d..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h +++ /dev/null @@ -1,62 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file OC_Endpoint_Selector_Loader.h - * - * $Id$ - * - * Strategies for selecting profile/endpoint from an IOR for making an - * invocation. - * - * @author Phil Mesnier <mesnier_p@ociweb.com> - */ -//============================================================================= - - -#ifndef TAO_OC_ENDPOINT_LOADER_H -#define TAO_OC_ENDPOINT_LOADER_H -#include /**/ "ace/pre.h" - -#include "tao/Strategies/strategies_export.h" -#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Forward references -class TAO_Optimized_Connection_Endpoint_Selector; - -// **************************************************************** - -/** - * @class TAO_OC_Endpoint_Selector_Loader - * - * @brief Static initializer used to ensure the Optimized Connector - * Endpoint Selector is available for use in static applications - * - * This class is not needed when using dynamic linking and the service - * configuratior. Statically linked applications need to include this - * header to ensure that all the necessary dependencies are met. In - * addition, the svc config directive is required for setting any - * initialization parameters for the endpoint selector. - * - */ -class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader -{ -public: - TAO_OC_Endpoint_Selector_Loader (void); -}; - - -static TAO_OC_Endpoint_Selector_Loader _TAO_oc_endpoint_selector_loader; - - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_OC_ENDPOINT_LOADER_H */ diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp deleted file mode 100644 index dae584e8152..00000000000 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// -*- C++ -*- - -#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h" - -#include "tao/debug.h" -#include "tao/Stub.h" -#include "tao/Profile.h" -#include "tao/Endpoint.h" -#include "tao/Base_Transport_Property.h" -#include "tao/ORB_Core.h" -#include "tao/Transport.h" -#include "tao/Profile_Transport_Resolver.h" - -ACE_RCSID (tao, - Invocation_Endpoint_Selectors, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// **************************************************************** - -ACE_Time_Value TAO_Optimized_Connection_Endpoint_Selector::timeout_; - -TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) -{ - TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv; - if (TAO_debug_level) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector:") - ACE_TEXT ("Initializing timeout hook tv = %d sec, %d usec\n"), - tv.sec(), tv.usec())); - } - if (tv > ACE_Time_Value::zero) - { - TAO_ORB_Core::connection_timeout_hook - (TAO_Optimized_Connection_Endpoint_Selector::hook); - } -} - -TAO_Optimized_Connection_Endpoint_Selector::~TAO_Optimized_Connection_Endpoint_Selector (void) -{ -} - - -void -TAO_Optimized_Connection_Endpoint_Selector::hook (TAO_ORB_Core *, - TAO_Stub *, - bool &has_timeout, - ACE_Time_Value &tv) -{ - has_timeout = - TAO_Optimized_Connection_Endpoint_Selector:: - timeout_ > ACE_Time_Value::zero; - if (has_timeout) - tv = TAO_Optimized_Connection_Endpoint_Selector::timeout_; -} - -int -TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p, - TAO::Profile_Transport_Resolver *r) -{ - TAO_Endpoint *effective_endpoint = 0; - - r->profile(p); - effective_endpoint = p->endpoint (); - size_t endpoint_count = p->endpoint_count(); - for (size_t i = 0; i < endpoint_count; ++i) - { - TAO_Base_Transport_Property desc (effective_endpoint); - if (r->find_transport(&desc)) - return 1; - // Go to the next endpoint in this profile - effective_endpoint = effective_endpoint->next(); - } - return 0; -} - -void -TAO_Optimized_Connection_Endpoint_Selector::select_endpoint - ( TAO::Profile_Transport_Resolver *r, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) -{ - TAO_Stub *stub = r->stub(); - TAO_Profile *p = stub->profile_in_use(); - - // first, look for the endpoints for the current profile in use. - // if that is available then go for it. - - if (this->check_profile (p, r) != 0) - return; - - // next, look for any other profiles. If the stub has any forward profiles, - // use those, otherwise look at the base profiles. This separation is - // necessary to avoid re-using a corbaloc or other previously forwarded - // profile. - - const TAO_MProfile *profiles = stub->forward_profiles(); - if (profiles != 0) - { - for (CORBA::ULong count = 0; count < profiles->profile_count(); count++) - { - p = const_cast<TAO_Profile *>(profiles->get_profile(count)); - if (this->check_profile (p, r) != 0) - { - if (stub->profile_in_use() != p) - { - // thread-safe way to coerse stub to this profile. - stub->reset_profiles(); - while (stub->profile_in_use() != p) - if (stub->next_profile_retry() == 0) - break; - } - return; - } - } - } - else - { - do - { - p = stub->profile_in_use(); - if (this->check_profile(p, r) != 0) - return; - } - while (stub->next_profile_retry () != 0); - } - - - - // 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). - - do - { - r->profile (r->stub ()->profile_in_use ()); - - // Check whether we need to do a blocked wait or we have a - // non-blocked wait and we support that. If this is not the - // case we can't use this profile so try the next. - if (r->blocked_connect () || - (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ())) - { - const size_t endpoint_count = - r->profile ()->endpoint_count (); - - TAO_Endpoint *ep = - r->profile ()->endpoint (); - - for (size_t i = 0; i < endpoint_count; ++i) - { - TAO_Base_Transport_Property desc (ep); - const bool retval = - r->try_connect (&desc, - max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Check if the connect has completed. - if (retval) - return; - - // Go to the next endpoint in this profile. - ep = ep->next (); - } - } - } - while (r->stub ()->next_profile_retry () != 0); - - // If we get here, we completely failed to find an endpoint selector - // that we know how to use, so throw an exception. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h deleted file mode 100644 index 818541916c6..00000000000 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ /dev/null @@ -1,80 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file Optimized_Connection_Endpoint_Selector.h - * - * $Id$ - * - * Strategies for selecting profile/endpoint from an IOR for making an - * invocation. - * - * @author Phil Mesnier <mesnier_p@ociweb.com> - */ -//============================================================================= - - -#ifndef TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H -#define TAO_OPTIMIZED_ENDPOINT_SELECTOR_H - -#include /**/ "ace/pre.h" - -#include "tao/corbafwd.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Strategies/strategies_export.h" - -#include "tao/Invocation_Endpoint_Selectors.h" -#include "ace/Time_Value.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_GIOP_Invocation; -class TAO_ORB_Core; -class TAO_Stub; -class TAO_Profile; - -/** - * @class TAO_Optimized_Connection_Endpoint_Selector - * - * @brief More efficient connection strategy for endpoint selection. - * - * This strategy builds on the default by first querying the connection - * cache for all potential endpoints before iterating over the list to - * attempt to create new connections. - */ - -class TAO_Strategies_Export TAO_Optimized_Connection_Endpoint_Selector : -public TAO_Default_Endpoint_Selector -{ -public: - /// Constructor. - TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value& tv); - - /// Destructor. - virtual ~TAO_Optimized_Connection_Endpoint_Selector (void); - - static void hook (TAO_ORB_Core *, - TAO_Stub *, - bool &has_timeout, - ACE_Time_Value &tv); - - virtual void select_endpoint (TAO::Profile_Transport_Resolver *, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL); -private: - - int check_profile (TAO_Profile *, - TAO::Profile_Transport_Resolver *); - - static ACE_Time_Value timeout_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 03574aa5b2b..cd8b50e2502 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -11,16 +11,13 @@ #include "tao/CDR.h" #if !defined(__ACE_INLINE__) -#include "tao/Strategies/SCIOP_Acceptor.i" +#include "SCIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, SCIOP_Acceptor, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE), addrs_ (0), @@ -610,7 +607,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -1031,6 +1028,4 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index f81492115c2..a62f9e9d395 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =================================================================== /* @@ -32,12 +30,10 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" #include "tao/Transport_Acceptor.h" -#include "tao/Strategies/SCIOP_Connection_Handler.h" +#include "SCIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO SCIOP_Acceptor concrete call defination /** @@ -222,10 +218,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "tao/Strategies/SCIOP_Acceptor.i" +#include "SCIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.i b/TAO/tao/Strategies/SCIOP_Acceptor.i index a5f51de6042..b6e6b200890 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.i +++ b/TAO/tao/Strategies/SCIOP_Acceptor.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr& TAO_SCIOP_Acceptor::address (void) const { @@ -24,5 +21,3 @@ TAO_SCIOP_Acceptor::endpoints (void) return this->addrs_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 932a4e6b575..6bb68061112 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -1,4 +1,4 @@ -#include "tao/Strategies/SCIOP_Connection_Handler.h" +#include "SCIOP_Connection_Handler.h" #if TAO_HAS_SCIOP == 1 @@ -19,8 +19,8 @@ #include "tao/ORB.h" #include "tao/CDR.h" #include "tao/Server_Strategy_Factory.h" -#include "tao/Strategies/SCIOP_Transport.h" -#include "tao/Strategies/SCIOP_Endpoint.h" +#include "SCIOP_Transport.h" +#include "SCIOP_Endpoint.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Base_Transport_Property.h" @@ -32,8 +32,6 @@ ACE_RCSID (tao, SCIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SCIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -205,7 +203,7 @@ TAO_SCIOP_Connection_Handler::open (void*) return -1; this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -317,7 +315,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list ( ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()))); } // Construct an SCIOP_Endpoint object @@ -385,6 +383,4 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index 9cfe605b80f..741bb4762e4 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =================================================================== /** @@ -29,23 +27,23 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Connection_Handler.h" #include "tao/IIOPC.h" #include "ace/Svc_Handler.h" #include "ace/SOCK_SEQPACK_Association.h" -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH> TAO_SCIOP_SVC_HANDLER; +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT +template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + + // Forward Decls class TAO_Pluggable_Messaging; @@ -139,8 +137,6 @@ private: int dscp_codepoint_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 663bccdb60a..60ec25b6100 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/SCIOP_Connector.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Connector.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -24,9 +24,6 @@ ACE_RCSID (TAO, SCIOP_Connector, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SCIOP_PROFILE), lite_flag_ (flag), @@ -162,7 +159,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()), + ACE_TEXT_TO_TCHAR_IN(sciop_endpoint->host()), sciop_endpoint->port(), r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); @@ -425,6 +422,5 @@ TAO_SCIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 8431309099a..dd6aa57d8c2 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //============================================================================= /** @@ -30,14 +28,12 @@ #if TAO_HAS_SCIOP == 1 +class TAO_SCIOP_Endpoint; + #include "ace/Connector.h" #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" -#include "tao/Strategies/SCIOP_Connection_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_SCIOP_Endpoint; +#include "SCIOP_Connection_Handler.h" // **************************************************************** @@ -129,8 +125,6 @@ private: TAO_SCIOP_BASE_CONNECTOR base_connector_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 136d8927ff2..89ac5c3bd2c 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -1,4 +1,4 @@ -#include "tao/Strategies/SCIOP_Endpoint.h" +#include "SCIOP_Endpoint.h" #if TAO_HAS_SCIOP == 1 @@ -19,10 +19,9 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/SCIOP_Endpoint.i" +# include "SCIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) @@ -365,6 +364,4 @@ TAO_SCIOP_Endpoint::preferred_network (void) const return this->preferred_path_.host.in (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 483d0206c36..0095ccfe186 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -29,13 +29,11 @@ #if TAO_HAS_SCIOP == 1 #include "tao/Endpoint.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" #include "tao/IIOP_EndpointsC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_SCIOP_Connection_Handler; /** @@ -162,10 +160,9 @@ private: TAO_SCIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "tao/Strategies/SCIOP_Endpoint.i" +# include "SCIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.i b/TAO/tao/Strategies/SCIOP_Endpoint.i index 2174f62be7b..fd182741c6b 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.i +++ b/TAO/tao/Strategies/SCIOP_Endpoint.i @@ -1,8 +1,6 @@ // -*- C++ -*- // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const char * TAO_SCIOP_Endpoint::host (void) const { @@ -20,5 +18,3 @@ TAO_SCIOP_Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp index c6c0d3a271d..0383f053e2a 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Factory.cpp @@ -1,6 +1,6 @@ -#include "tao/Strategies/SCIOP_Factory.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Connector.h" +#include "SCIOP_Factory.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Connector.h" #include "ace/OS_NS_strings.h" #if TAO_HAS_SCIOP == 1 @@ -13,8 +13,6 @@ ACE_RCSID (tao, static const char prefix_[] = "sciop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE), major_ (TAO_DEF_SCIOP_MAJOR), @@ -81,8 +79,6 @@ TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory, ACE_TEXT ("SCIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index a81198ab706..7b4a30aab29 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //============================================================================= /** @@ -25,17 +23,14 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; -class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory -: public TAO_Protocol_Factory +class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory { public: TAO_SCIOP_Protocol_Factory (void); @@ -67,8 +62,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp index e71cb4dd6ce..849981f5e07 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp @@ -1,6 +1,6 @@ -#include "tao/Strategies/SCIOP_Lite_Factory.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Connector.h" +#include "SCIOP_Lite_Factory.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Connector.h" #include "ace/Dynamic_Service.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_strings.h" @@ -11,8 +11,6 @@ ACE_RCSID(tao, SCIOP_Factory, "$Id$") static const char prefix_[] = "sciop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE), major_ (TAO_DEF_SCIOP_MAJOR), @@ -85,8 +83,6 @@ TAO_SCIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Lite_Protocol_Factory, ACE_TEXT ("SCIOP_Lite_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h index c4e05a13bb9..cdade7a16e9 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //========================================================================== /** @@ -25,11 +23,10 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Acceptor; class TAO_Connector; @@ -68,8 +65,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory) diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 0a9b1da7693..7c48f8e3f8e 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // SCIOP_Profile.cpp -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -11,7 +11,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/StringSeqC.h" -#include "tao/Strategies/sciop_endpointsC.h" +#include "sciop_endpointsC.h" ACE_RCSID(Strategies, SCIOP_Profile, @@ -21,14 +21,14 @@ static const char prefix_[] = "sciop"; const char TAO_SCIOP_Profile::object_key_delimiter_ = '/'; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - char TAO_SCIOP_Profile::object_key_delimiter (void) const { return TAO_SCIOP_Profile::object_key_delimiter_; } + + TAO_SCIOP_Profile::TAO_SCIOP_Profile (const ACE_INET_Addr &addr, const TAO::ObjectKey &object_key, const TAO_GIOP_Message_Version &version, @@ -513,6 +513,4 @@ TAO_SCIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index c2abcf93a1b..5310af754b0 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -26,9 +26,8 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/SCIOP_Endpoint.h" +#include "SCIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO SCIOP_Profile concrete Profile definitions /** @@ -134,8 +133,6 @@ protected: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 72da213aa93..a5acf0d6395 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Strategies/SCIOP_Transport.h" +#include "SCIOP_Transport.h" #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/SCIOP_Connection_Handler.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Connection_Handler.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/Thread_Lane_Resources.h" #include "tao/operation_details.h" @@ -25,8 +25,6 @@ ACE_RCSID (tao, SCIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean ) @@ -382,6 +380,4 @@ TAO_SCIOP_Transport::get_listen_point ( return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index ad07a706b64..e51f42b5778 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =================================================================== /** @@ -25,12 +23,10 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/IIOPC.h" #include "ace/SOCK_SEQPACK_Association.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_SCIOP_Connection_Handler; class TAO_ORB_Core; @@ -141,8 +137,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 5de6670b1a1..595f3bb55db 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -1,10 +1,11 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/SHMIOP_Acceptor.h" +#include "SHMIOP_Acceptor.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Profile.h" +#include "SHMIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" @@ -19,8 +20,6 @@ ACE_RCSID (Strategies, SHMIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), @@ -206,7 +205,7 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core, return -1; // Port number must consist of digits if (port) - this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port)); + this->address_.set (ACE_TEXT_TO_TCHAR_IN(port)); return this->open_i (orb_core, reactor); @@ -331,7 +330,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_TEXT ("cannot cache hostname\n"))); return -1; } - this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host); + this->host_ = ACE_TEXT_TO_CHAR_OUT(tmp_host); } // This avoids having child processes acquire the listen socket thereby @@ -344,7 +343,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ") ACE_TEXT ("listening on : <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()), + ACE_TEXT_TO_TCHAR_IN(this->host_.c_str ()), this->address_.get_port_number ())); } return 0; @@ -478,7 +477,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR(opt.c_str ())), + ACE_TEXT_TO_TCHAR_IN(opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -500,13 +499,11 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), + ACE_TEXT_TO_TCHAR_IN(name.c_str ())), -1); } } return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index b1db53fd947..ef369ad0f9c 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // $Id$ // ============================================================================ @@ -31,15 +31,13 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Transport_Acceptor.h" -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "ace/Acceptor.h" #include "ace/MEM_Acceptor.h" #include "tao/GIOP_Message_Version.h" // TAO SHMIOP_Acceptor concrete call definitions -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_SHMIOP_Acceptor * @@ -150,8 +148,6 @@ private: CORBA::Boolean lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 788407dfd7d..9d384859ff7 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) @@ -13,7 +13,7 @@ #include "tao/Base_Transport_Property.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" -#include "tao/Strategies/SHMIOP_Endpoint.h" +#include "SHMIOP_Endpoint.h" #include "tao/Resume_Handle.h" #include "tao/Protocols_Hooks.h" @@ -24,8 +24,6 @@ ACE_RCSID (Strategies, SHMIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0) @@ -159,7 +157,7 @@ TAO_SHMIOP_Connection_Handler::open (void*) // Not needed, anyway this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -252,6 +250,4 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void) this->transport ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*(TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) */ diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 626c424920b..fbfa34bc1fc 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -28,12 +28,9 @@ #include "ace/Acceptor.h" #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" -#include "tao/Strategies/SHMIOP_Transport.h" +#include "SHMIOP_Transport.h" // **************************************************************** - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_SHMIOP_Connection_Handler * @@ -42,6 +39,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * The Connection handler which is common for the Acceptor and * the Connector */ + + class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler : public TAO_SHMIOP_SVC_HANDLER, public TAO_Connection_Handler @@ -104,8 +103,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index adba9338dc1..d1490b46eb0 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Strategies/SHMIOP_Connector.h" +#include "SHMIOP_Connector.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Profile.h" -#include "tao/Strategies/SHMIOP_Endpoint.h" +#include "SHMIOP_Profile.h" +#include "SHMIOP_Endpoint.h" #include "tao/debug.h" #include "tao/Base_Transport_Property.h" #include "tao/ORB_Core.h" @@ -21,8 +21,6 @@ ACE_RCSID (Strategies, SHMIOP_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SHMEM_PROFILE), connect_strategy_ (), @@ -35,6 +33,7 @@ TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void) { } + int TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core) { @@ -146,7 +145,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "making a new connection to <%s:%d>\n", - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port ())); // Get the right synch options @@ -182,7 +181,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") ACE_TEXT ("connection to <%s:%u> failed (%p)\n"), - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port (), ACE_TEXT ("errno"))); } @@ -196,7 +195,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port (), svc_handler->peer ().get_handle ())); @@ -349,6 +348,5 @@ TAO_SHMIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 95c1ef4a2f7..d4b41468c55 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -30,12 +30,10 @@ #include "ace/MEM_Connector.h" #include "ace/Connector.h" #include "tao/Transport_Connector.h" -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" #include "tao/Connector_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_SHMIOP_Endpoint; // **************************************************************** @@ -129,8 +127,6 @@ private: CORBA::Boolean lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp index cf24fcd5fba..8d2ca160b58 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp @@ -1,10 +1,12 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/SHMIOP_Endpoint.h" + +#include "SHMIOP_Endpoint.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -17,13 +19,11 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/SHMIOP_Endpoint.i" +# include "SHMIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr, int use_dotted_decimal_addresses) : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE) @@ -260,7 +260,4 @@ TAO_SHMIOP_Endpoint::object_addr (void) const return this->object_addr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h index bd5b24ffb14..c44a9f6705f 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.h +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h @@ -25,13 +25,12 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/CORBA_String.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/INET_Addr.h" #include "ace/MEM_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_SHMIOP_Endpoint @@ -136,10 +135,8 @@ private: TAO_SHMIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/SHMIOP_Endpoint.i" +# include "SHMIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.i b/TAO/tao/Strategies/SHMIOP_Endpoint.i index e507b39c440..e5a11fae5ab 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.i +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const char * TAO_SHMIOP_Endpoint::host (void) const { @@ -21,5 +18,3 @@ TAO_SHMIOP_Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 27cca45b226..6d49937a410 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -1,9 +1,9 @@ -#include "tao/Strategies/SHMIOP_Factory.h" +#include "SHMIOP_Factory.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Acceptor.h" -#include "tao/Strategies/SHMIOP_Connector.h" +#include "SHMIOP_Acceptor.h" +#include "SHMIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -19,8 +19,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "shmiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE), major_ (TAO_DEF_GIOP_MAJOR), @@ -82,12 +80,12 @@ TAO_SHMIOP_Protocol_Factory::init (int argc, { const ACE_TCHAR *current_arg = 0; - if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize")))) + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize")))) { this->min_bytes_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix")))) { this->mmap_prefix_ = ACE::strnew (current_arg); arg_shifter.consume_arg (); @@ -118,8 +116,6 @@ TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory, ACE_TEXT ("SHMIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index fff404e0d98..4093b9069e6 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ // ============================================================================ // @@ -28,17 +27,14 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Protocol_Factory.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; -class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory - : public TAO_Protocol_Factory +class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory : public TAO_Protocol_Factory { public: /// Constructor. @@ -91,8 +87,6 @@ private: off_t min_bytes_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_SHMIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 71a73c4dc7c..db66c5aa82d 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -1,4 +1,4 @@ -#include "tao/Strategies/SHMIOP_Profile.h" +#include "SHMIOP_Profile.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) @@ -20,8 +20,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "shmiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/'; char @@ -511,6 +509,4 @@ TAO_SHMIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index f71d1546cb1..b7f367aea82 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,11 +27,10 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Profile.h" -#include "tao/Strategies/SHMIOP_Endpoint.h" +#include "SHMIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO SHMIOP_Profile concrete Profile definitions /** @@ -123,8 +122,6 @@ private: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 23e03b8e94b..47fe0a6c898 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -1,11 +1,12 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/SHMIOP_Transport.h" +#include "SHMIOP_Transport.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Connection_Handler.h" -#include "tao/Strategies/SHMIOP_Profile.h" +#include "SHMIOP_Connection_Handler.h" +#include "SHMIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" @@ -19,9 +20,6 @@ ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -137,135 +135,31 @@ TAO_SHMIOP_Transport::recv (char *buf, return n; } + int -TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time, - int) +TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time) { - if (TAO_debug_level > 3) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input\n", - this->id ())); - } - - // The buffer on the stack which will be used to hold the input - // messages, compensate shrink due to alignment - char buf [TAO_MAXBUFSIZE + ACE_CDR::MAX_ALIGNMENT]; - + // Calculate the actual length of the load that we are supposed to + // read which is equal to the <missing_data> + length of the buffer + // that we have.. + size_t payload = missing_data + incoming.length (); -#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) - (void) ACE_OS::memset (buf, - '\0', - sizeof buf); -#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ - - // Create a data block - ACE_Data_Block db (sizeof (buf), - ACE_Message_Block::MB_DATA, - buf, - this->orb_core_->input_cdr_buffer_allocator (), - this->orb_core_->locking_strategy (), - ACE_Message_Block::DONT_DELETE, - this->orb_core_->input_cdr_dblock_allocator ()); - - // Create a message block - ACE_Message_Block message_block (&db, - ACE_Message_Block::DONT_DELETE, - this->orb_core_->input_cdr_msgblock_allocator ()); - - - // Align the message block - ACE_CDR::mb_align (&message_block); - - const size_t missing_header_data = this->messaging_object ()->header_length (); - - if (missing_header_data == 0) - { - return -1; - } + // Grow the buffer to the size of the message + ACE_CDR::grow (&incoming, + payload); // .. do a read on the socket again. ssize_t bytes = 0; // As this used for transports where things are available in one // shot this looping should not create any problems. - for (size_t m = missing_header_data; - m != 0; - m -= bytes) - { - bytes = 0; // reset - - // We would have liked to use something like a recv_n () - // here. But at the time when the code was written, the MEM_Stream - // classes had poor support for recv_n (). Till a day when we - // get proper recv_n (), let us stick with this. The other - // argument that can be said against this is that, this is the - // bad layer in which this is being done ie. recv_n is - // simulated. But... - bytes = this->recv (message_block.wr_ptr (), - m, - max_wait_time); - - if (bytes == 0 || - bytes == -1) - { - return -1; - } - - message_block.wr_ptr (bytes); - } - - TAO_Queued_Data qd (&message_block); - size_t mesg_length; // not used - - // Parse the incoming message for validity. The check needs to be - // performed by the messaging objects. - if (this->messaging_object ()->parse_next_message (message_block, - qd, - mesg_length) == -1) - return -1; - - if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) - { - // parse/marshal error happened - return -1; - } - - if (message_block.length () > mesg_length) - { - // we read too much data - return -1; - } - - if (message_block.space () < qd.missing_data_) - { - const size_t message_size = message_block.length () - + qd.missing_data_; - - // reallocate buffer with correct size on heap - if (ACE_CDR::grow (&message_block, message_size) == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input, " - "error growing message buffer\n", - this->id () )); - } - return -1; - } - - } - - // As this used for transports where things are available in one - // shot this looping should not create any problems. - for (size_t n = qd.missing_data_; + for (size_t n = missing_data; n != 0; n -= bytes) { - bytes = 0; // reset - // We would have liked to use something like a recv_n () // here. But at the time when the code was written, the MEM_Stream // classes had poor support for recv_n (). Till a day when we @@ -273,7 +167,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, // argument that can be said against this is that, this is the // bad layer in which this is being done ie. recv_n is // simulated. But... - bytes = this->recv (message_block.wr_ptr (), + bytes = this->recv (incoming.wr_ptr (), n, max_wait_time); @@ -283,24 +177,21 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, return -1; } - message_block.wr_ptr (bytes); - + incoming.wr_ptr (bytes); } - qd.missing_data_ = 0; + TAO_Queued_Data pqd (&incoming); + + // With SHMIOP we would not have any missing data... + pqd.missing_data_ = 0; + + this->messaging_object ()->get_message_data (&pqd); // Now we have a full message in our buffer. Just go ahead and // process that - if (this->process_parsed_messages (&qd, rh) == -1) - { - return -1; - } - - return 0; + return this->process_parsed_messages (&pqd, rh); } - - int TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, @@ -367,6 +258,4 @@ TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 6c90b821c4e..a8655d8c1db 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -24,17 +24,11 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Svc_Handler.h" #include "ace/MEM_Stream.h" #include "tao/Transport.h" -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_SHMIOP_Connection_Handler; class TAO_Pluggable_Messaging; class TAO_Target_Specification; @@ -43,6 +37,10 @@ class Tao_Operation_Details; typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH> TAO_SHMIOP_SVC_HANDLER; +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT +template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + /** * @class TAO_SHMIOP_Transport * @@ -84,9 +82,11 @@ protected: size_t len, const ACE_Time_Value *s = 0); - virtual int handle_input (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time, - int block = 0); + virtual int consolidate_message (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time); + //@} public: @@ -116,8 +116,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 87917221593..4ec98202ca3 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -1,8 +1,8 @@ -#include "tao/Strategies/UIOP_Acceptor.h" +#include "UIOP_Acceptor.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" @@ -19,8 +19,6 @@ ACE_RCSID (Strategies, UIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_UIOP_PROFILE), base_acceptor_ (), @@ -479,6 +477,4 @@ TAO_UIOP_Acceptor::parse_options (const char *str) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h index 20de4591230..7610ce7f277 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.h +++ b/TAO/tao/Strategies/UIOP_Acceptor.h @@ -25,7 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Connection_Handler.h" #include "tao/Transport_Acceptor.h" #include "tao/Acceptor_Impl.h" @@ -34,8 +34,6 @@ #include "ace/Acceptor.h" #include "ace/LSOCK_Acceptor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_UIOP_Acceptor * @@ -137,8 +135,6 @@ private: const bool lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index ada81ab9075..7db6103a5d2 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Connection_Handler.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Transport.h" -#include "tao/Strategies/UIOP_Endpoint.h" +#include "UIOP_Transport.h" +#include "UIOP_Endpoint.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -23,7 +23,6 @@ ACE_RCSID (Strategies, UIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_UIOP_SVC_HANDLER (t, 0 , 0), @@ -138,7 +137,7 @@ TAO_UIOP_Connection_Handler::open (void*) return -1; this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -229,6 +228,4 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void) this->transport ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*TAO_HAS_UIOP == 1*/ diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index c2e0078cd00..ca14c8aeb4a 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -32,9 +32,7 @@ #include "ace/Reactor.h" #include "tao/Connection_Handler.h" #include "tao/Wait_Strategy.h" -#include "tao/Strategies/UIOP_Transport.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "UIOP_Transport.h" // Forward Decls class TAO_Pluggable_Messaging; @@ -88,6 +86,7 @@ public: const void *act = 0); //@} + /// Add ourselves to Cache. int add_transport_to_cache (void); @@ -101,8 +100,6 @@ protected: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index efce00f17d2..6ce63d9709a 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -1,8 +1,8 @@ -#include "tao/Strategies/UIOP_Connector.h" +#include "UIOP_Connector.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Environment.h" @@ -21,8 +21,6 @@ ACE_RCSID(Strategies, UIOP_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_UIOP_PROFILE), connect_strategy_ (), @@ -397,7 +395,7 @@ TAO_UIOP_Connector::cancel_svc_handler ( TAO_Connection_Handler * svc_handler) { TAO_UIOP_Connection_Handler* handler= - dynamic_cast<TAO_UIOP_Connection_Handler*> (svc_handler); + dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler); if (handler) // Cancel from the connector @@ -406,6 +404,4 @@ TAO_UIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 1898316e91a..e53b09b3295 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -31,12 +31,10 @@ #include "ace/LSOCK_Connector.h" #include "ace/Connector.h" #include "tao/Transport_Connector.h" -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" #include "tao/Connector_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_UIOP_Endpoint; class TAO_Endpoint; @@ -75,7 +73,7 @@ public: virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len ACE_ENV_ARG_DECL); - + virtual char object_key_delimiter (void) const; /// Cancel the passed cvs handler from the connector @@ -133,8 +131,6 @@ private: const bool lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp index f0ff4199582..d843a8b2d14 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/UIOP_Endpoint.h" -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Endpoint.h" +#include "UIOP_Connection_Handler.h" #include "tao/ORB_Constants.h" @@ -15,10 +15,9 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/UIOP_Endpoint.i" +# include "UIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr, CORBA::Short priority) @@ -103,7 +102,4 @@ TAO_UIOP_Endpoint::hash (void) return this->hash_val_; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index dfff6c2a1f2..f788dc014d6 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -24,10 +24,9 @@ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/UNIX_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_UIOP_Endpoint @@ -92,10 +91,8 @@ private: TAO_UIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/UIOP_Endpoint.i" +# include "UIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ # endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i index a7a01b59c3d..337bbae6a76 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.i +++ b/TAO/tao/Strategies/UIOP_Endpoint.i @@ -1,23 +1,19 @@ // -*- C++ -*- -// // $Id$ # if TAO_HAS_UIOP == 1 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_UNIX_Addr & TAO_UIOP_Endpoint::object_addr (void) const { return this->object_addr_; } + ACE_INLINE const char * TAO_UIOP_Endpoint::rendezvous_point (void) const { return this->object_addr_.get_path_name (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index b74a464f82c..080f76eccc8 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -1,12 +1,12 @@ // -*- C++ -*- // $Id$ -#include "tao/Strategies/UIOP_Factory.h" +#include "UIOP_Factory.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Acceptor.h" -#include "tao/Strategies/UIOP_Connector.h" +#include "UIOP_Acceptor.h" +#include "UIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -20,8 +20,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "uiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE), major_ (TAO_DEF_GIOP_MAJOR), @@ -89,8 +87,6 @@ TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory, ACE_TEXT ("UIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h index d3ec7616987..6214e67f0a1 100644 --- a/TAO/tao/Strategies/UIOP_Factory.h +++ b/TAO/tao/Strategies/UIOP_Factory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ // ============================================================================ // @@ -29,11 +28,9 @@ # if TAO_HAS_UIOP == 1 #include "tao/Protocol_Factory.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; @@ -78,8 +75,6 @@ private: // compatibility with old clients. }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp index 8aa707a3472..b86f8fe3856 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp @@ -1,9 +1,9 @@ -#include "tao/Strategies/UIOP_Lite_Factory.h" +#include "UIOP_Lite_Factory.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Acceptor.h" -#include "tao/Strategies/UIOP_Connector.h" +#include "UIOP_Acceptor.h" +#include "UIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -18,8 +18,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "uiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE), major_ (TAO_DEF_GIOP_MAJOR), @@ -91,8 +89,6 @@ TAO_UIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_UIOP_Lite_Protocol_Factory, ACE_TEXT ("UIOP_Lite_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h index 9199095b1cc..332506d4dbd 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ // ============================================================================ // @@ -29,14 +28,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; + class TAO_Strategies_Export TAO_UIOP_Lite_Protocol_Factory : public TAO_Protocol_Factory { @@ -80,8 +78,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_UIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory) diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 853bfc83d9e..76ba5ede816 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -1,8 +1,8 @@ -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Profile.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/uiop_endpointsC.h" +#include "uiop_endpointsC.h" #include "tao/CDR.h" #include "tao/Environment.h" @@ -20,8 +20,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "uiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const char TAO_UIOP_Profile::object_key_delimiter_ = '|'; char @@ -449,6 +447,4 @@ TAO_UIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index fe515c4d388..069c5105965 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -27,14 +27,13 @@ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Profile.h" -#include "tao/Strategies/UIOP_Connection_Handler.h" -#include "tao/Strategies/UIOP_Endpoint.h" +#include "UIOP_Connection_Handler.h" +#include "UIOP_Endpoint.h" #include "ace/UNIX_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_UIOP_Profile @@ -121,8 +120,6 @@ private: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 4adc371f55a..df5a0032644 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/UIOP_Transport.h" +#include "UIOP_Transport.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Connection_Handler.h" -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Connection_Handler.h" +#include "UIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" @@ -20,9 +20,6 @@ ACE_RCSID (Strategies, UIOP_Transport, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -186,6 +183,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream, return 1; } + int TAO_UIOP_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) @@ -195,6 +193,4 @@ TAO_UIOP_Transport::messaging_init (CORBA::Octet major, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP */ diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 1a7599f45fb..aefcb26ecbc 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -25,13 +25,11 @@ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/LSOCK_Acceptor.h" #include "ace/Svc_Handler.h" #include "tao/Transport.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_ORB_Core; @@ -112,8 +110,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index dc6c0a5886f..62c42275c06 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -1,17 +1,17 @@ // $Id$ #include "ace/Service_Config.h" -#include "tao/Strategies/advanced_resource.h" +#include "advanced_resource.h" -#include "tao/Strategies/UIOP_Factory.h" -#include "tao/Strategies/SHMIOP_Factory.h" -#include "tao/Strategies/DIOP_Factory.h" -#include "tao/Strategies/SCIOP_Factory.h" +#include "UIOP_Factory.h" +#include "SHMIOP_Factory.h" +#include "DIOP_Factory.h" +#include "SCIOP_Factory.h" -#include "tao/Strategies/LFU_Connection_Purging_Strategy.h" -#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h" -#include "tao/Strategies/NULL_Connection_Purging_Strategy.h" +#include "LFU_Connection_Purging_Strategy.h" +#include "FIFO_Connection_Purging_Strategy.h" +#include "NULL_Connection_Purging_Strategy.h" -#include "tao/Strategies/LF_Strategy_Null.h" +#include "LF_Strategy_Null.h" #include "tao/debug.h" #include "tao/LRU_Connection_Purging_Strategy.h" @@ -37,8 +37,6 @@ ACE_RCSID(Strategies, advanced_resource, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void) { @@ -130,7 +128,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) -1); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorLock")))) { ACE_DEBUG ((LM_DEBUG, @@ -144,7 +142,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorType")))) { if (ACE_OS::strcasecmp (current_arg, @@ -186,7 +184,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBInputCDRAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -208,7 +206,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMHResponseHandlerAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -228,7 +226,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMIResponseHandlerAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -248,7 +246,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorThreadQueue")))) { if (ACE_OS::strcasecmp (current_arg, @@ -384,7 +382,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -447,7 +445,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -510,7 +508,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -573,7 +571,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -606,7 +604,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to load ") ACE_TEXT("protocol <%s>, %m\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), + ACE_TEXT_TO_TCHAR_IN(name.c_str ())), -1); } @@ -614,7 +612,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Loaded protocol <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(name.c_str ()))); } } return 0; @@ -691,6 +689,9 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; +typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; +typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; + ACE_Allocator * TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void) { @@ -721,9 +722,12 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void) NULL_LOCK_ALLOCATOR, 0); break; + case TAO_ALLOCATOR_THREAD_LOCK: default: - return - this->TAO_Default_Resource_Factory::input_cdr_buffer_allocator(); + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); + break; } return allocator; } @@ -874,8 +878,6 @@ TAO_Advanced_Resource_Factory::report_unsupported_error ( option_name)); } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory, diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index 98dde1143d3..17c1279003c 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -4,7 +4,7 @@ #define TAO_ADVANCED_RESOURCE_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/default_resource.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -13,8 +13,6 @@ #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Connection_Purging_Strategy; class TAO_Strategies_Export TAO_Resource_Factory_Changer @@ -134,12 +132,10 @@ protected: }; -static TAO_Resource_Factory_Changer TAO_changer; - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory) +static TAO_Resource_Factory_Changer TAO_changer; + #include /**/ "ace/post.h" #endif /* TAO_ADVANCED_RESOURCE_H */ diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp index 7b5dbd4fd68..21e65ac0c8a 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.cpp +++ b/TAO/tao/Strategies/sciop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/Strategies/sciop_endpointsC.h" +#include "sciop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -266,5 +264,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h index 4944c7276c0..4e89a5b4e47 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.h +++ b/TAO/tao/Strategies/sciop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" @@ -62,8 +62,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -185,8 +183,6 @@ TAO_Strategies_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp index a9b2ed7f462..c3728f7bf79 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.cpp +++ b/TAO/tao/Strategies/uiop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/Strategies/uiop_endpointsC.h" +#include "uiop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -263,5 +261,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h index 1907a64939b..f85b1a69906 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.h +++ b/TAO/tao/Strategies/uiop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" @@ -62,8 +62,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -184,8 +182,6 @@ TAO_Strategies_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ |