diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-02 07:13:04 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-02 07:13:04 +0000 |
| commit | ef90f48326d00ec9fcb44bc43ac249e4617d7cb7 (patch) | |
| tree | 52300a84c07910ff7f95f76d7b2820c1a4b59606 | |
| parent | 681f78f9142968f31054464967191979d51af69b (diff) | |
| download | ATCD-ef90f48326d00ec9fcb44bc43ac249e4617d7cb7.tar.gz | |
ChangeLogTag:Tue Nov 1 14:49:40 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
345 files changed, 2292 insertions, 598 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c85512c2248..cffa30f9e3d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -19,13 +19,15 @@ Tue Nov 1 14:49:40 2005 Ossama Othman <ossama@dre.vanderbilt.edu> (end_client_stubs, end_server_inline): New methods that (currently) add ending versioned namespace - macro/declaration to the corresponding inline file. + macro/declaration to the corresponding file. * TAO_IDL/be/be_visitor_root/root.cpp (visit_root): - Added calls to end client and server inline files. + Added calls to end client stubs, and client and server inline + files. * tao/Makefile.am (nobase_include_HEADERS): + * tao/tao.mpc: Added new "tao/Versioned_Namespace.h" header. @@ -33,6 +35,356 @@ Tue Nov 1 14:49:40 2005 Ossama Othman <ossama@dre.vanderbilt.edu> TAO-specific versioned namespace macros. + * tao/Abstract_Servant_Base.cpp: + * tao/Abstract_Servant_Base.h: + * tao/Acceptor_Filter.cpp: + * tao/Acceptor_Filter.h: + * tao/Acceptor_Impl.cpp: + * tao/Acceptor_Impl.h: + * tao/Acceptor_Registry.cpp: + * tao/Acceptor_Registry.h: + * tao/Acceptor_Registry.i: + * tao/Adapter.cpp: + * tao/Adapter.h: + * tao/Adapter_Factory.cpp: + * tao/Adapter_Factory.h: + * tao/Adapter_Registry.cpp: + * tao/Adapter_Registry.h: + * tao/Allocator.h: + * tao/AnyTypeCode_Adapter.cpp: + * tao/AnyTypeCode_Adapter.h: + * tao/Any_Insert_Policy_T.h: + * tao/Arg_Traits_T.h: + * tao/Argument.cpp: + * tao/Argument.h: + * tao/Array_VarOut_T.cpp: + * tao/Array_VarOut_T.h: + * tao/Array_VarOut_T.inl: + * tao/Asynch_Queued_Message.cpp: + * tao/Asynch_Reply_Dispatcher_Base.cpp: + * tao/Asynch_Reply_Dispatcher_Base.h: + * tao/Asynch_Reply_Dispatcher_Base.i: + * tao/Auto_Functor.h: + * tao/BD_String_Argument_T.cpp: + * tao/BD_String_Argument_T.h: + * tao/BD_String_Argument_T.inl: + * tao/Base_Transport_Property.cpp: + * tao/Base_Transport_Property.h: + * tao/Base_Transport_Property.inl: + * tao/Basic_Argument_T.cpp: + * tao/Basic_Argument_T.h: + * tao/Basic_Argument_T.inl: + * tao/Basic_Arguments.h: + * tao/Basic_Types.h: + * tao/BiDir_Adapter.cpp: + * tao/BiDir_Adapter.h: + * tao/Bind_Dispatcher_Guard.cpp: + * tao/Bind_Dispatcher_Guard.h: + * tao/Bind_Dispatcher_Guard.i: + * tao/Block_Flushing_Strategy.cpp: + * tao/Block_Flushing_Strategy.h: + * tao/Blocked_Connect_Strategy.cpp: + * tao/Blocked_Connect_Strategy.h: + * tao/Buffer_Allocator_T.cpp: + * tao/Buffer_Allocator_T.h: + * tao/Buffering_Constraint_Policy.cpp: + * tao/Buffering_Constraint_Policy.h: + * tao/Buffering_Constraint_Policy.i: + * tao/CDR.cpp: + * tao/CDR.h: + * tao/CDR.i: + * tao/CORBALOC_Parser.cpp: + * tao/CORBALOC_Parser.h: + * tao/CORBALOC_Parser.i: + * tao/CORBANAME_Parser.cpp: + * tao/CORBANAME_Parser.h: + * tao/CORBANAME_Parser.i: + * tao/CORBA_String.cpp: + * tao/CORBA_String.h: + * tao/CORBA_String.inl: + * tao/Cache_Entries.cpp: + * tao/Cache_Entries.h: + * tao/Cache_Entries.inl: + * tao/Cleanup_Func_Registry.cpp: + * tao/Cleanup_Func_Registry.h: + * tao/Cleanup_Func_Registry.inl: + * tao/ClientRequestInterceptor_Adapter.cpp: + * tao/ClientRequestInterceptor_Adapter.h: + * tao/ClientRequestInterceptor_Adapter_Factory.cpp: + * tao/ClientRequestInterceptor_Adapter_Factory.h: + * tao/Client_Strategy_Factory.cpp: + * tao/Client_Strategy_Factory.h: + * tao/Codeset_Descriptor_Base.h: + * tao/Codeset_Manager.cpp: + * tao/Codeset_Manager.h: + * tao/Codeset_Manager_Factory_Base.cpp: + * tao/Codeset_Manager_Factory_Base.h: + * tao/Codeset_Translator_Base.cpp: + * tao/Codeset_Translator_Base.h: + * tao/Collocated_Invocation.cpp: + * tao/Collocated_Invocation.h: + * tao/Collocation_Proxy_Broker.cpp: + * tao/Collocation_Proxy_Broker.h: + * tao/Collocation_Resolver.cpp: + * tao/Collocation_Resolver.h: + * tao/Condition.cpp: + * tao/Condition.h: + * tao/Condition.inl: + * tao/Connect_Strategy.cpp: + * tao/Connect_Strategy.h: + * tao/Connection_Handler.cpp: + * tao/Connection_Handler.h: + * tao/Connection_Handler.inl: + * tao/Connection_Purging_Strategy.cpp: + * tao/Connection_Purging_Strategy.h: + * tao/Connection_Purging_Strategy.inl: + * tao/Connector_Impl.cpp: + * tao/Connector_Impl.h: + * tao/Connector_Registry.cpp: + * tao/Connector_Registry.h: + * tao/Connector_Registry.i: + * tao/DLL_Parser.cpp: + * tao/DLL_Parser.h: + * tao/DLL_Parser.i: + * tao/Default_Collocation_Resolver.cpp: + * tao/Default_Collocation_Resolver.h: + * tao/Default_Endpoint_Selector_Factory.cpp: + * tao/Default_Endpoint_Selector_Factory.h: + * tao/Default_Protocols_Hooks.cpp: + * tao/Default_Protocols_Hooks.h: + * tao/Default_Stub_Factory.cpp: + * tao/Default_Stub_Factory.h: + * tao/Default_Thread_Lane_Resources_Manager.cpp: + * tao/Default_Thread_Lane_Resources_Manager.h: + * tao/Dynamic_Adapter.cpp: + * tao/Dynamic_Adapter.h: + * tao/Endpoint.cpp: + * tao/Endpoint.h: + * tao/Endpoint.i: + * tao/Endpoint_Selector_Factory.cpp: + * tao/Endpoint_Selector_Factory.h: + * tao/Environment.cpp: + * tao/Environment.h: + * tao/Environment.i: + * tao/Exception.cpp: + * tao/Exception.h: + * tao/Exception.i: + * tao/Exception_Data.h: + * tao/Exclusive_TMS.cpp: + * tao/Exclusive_TMS.h: + * tao/FILE_Parser.cpp: + * tao/FILE_Parser.h: + * tao/FILE_Parser.i: + * tao/Fault_Tolerance_Service.cpp: + * tao/Fault_Tolerance_Service.h: + * tao/Fault_Tolerance_Service.i: + * tao/Fixed_Array_Argument_T.cpp: + * tao/Fixed_Array_Argument_T.h: + * tao/Fixed_Array_Argument_T.inl: + * tao/Fixed_Size_Argument_T.cpp: + * tao/Fixed_Size_Argument_T.h: + * tao/Fixed_Size_Argument_T.inl: + * tao/FlResource_Factory.cpp: + * tao/FlResource_Factory.h: + * tao/FlResource_Loader.cpp: + * tao/FlResource_Loader.h: + * tao/Flushing_Strategy.cpp: + * tao/Flushing_Strategy.h: + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Base.h: + * tao/GIOP_Message_Generator_Parser.cpp: + * tao/GIOP_Message_Generator_Parser.h: + * tao/GIOP_Message_Generator_Parser_10.cpp: + * tao/GIOP_Message_Generator_Parser_10.h: + * tao/GIOP_Message_Generator_Parser_11.cpp: + * tao/GIOP_Message_Generator_Parser_11.h: + * tao/GIOP_Message_Generator_Parser_12.cpp: + * tao/GIOP_Message_Generator_Parser_12.h: + * tao/GIOP_Message_Generator_Parser_Impl.h: + * tao/GIOP_Message_Generator_Parser_Impl.inl: + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Message_Lite.h: + * tao/GIOP_Message_Locate_Header.cpp: + * tao/GIOP_Message_Locate_Header.h: + * tao/GIOP_Message_Locate_Header.i: + * tao/GIOP_Message_State.cpp: + * tao/GIOP_Message_State.h: + * tao/GIOP_Message_State.inl: + * tao/GIOP_Message_Version.h: + * tao/GIOP_Message_Version.inl: + * tao/GIOP_Utils.cpp: + * tao/GIOP_Utils.h: + * tao/GUIResource_Factory.cpp: + * tao/GUIResource_Factory.h: + * tao/IFR_Client_Adapter.cpp: + * tao/IFR_Client_Adapter.h: + * tao/IIOP_Acceptor.cpp: + * tao/IIOP_Acceptor.h: + * tao/IIOP_Acceptor.i: + * tao/IIOP_Connection_Handler.cpp: + * tao/IIOP_Connection_Handler.h: + * tao/IIOP_Connector.cpp: + * tao/IIOP_Connector.h: + * tao/IIOP_Endpoint.cpp: + * tao/IIOP_Endpoint.h: + * tao/IIOP_Endpoint.i: + * tao/IIOP_Factory.cpp: + * tao/IIOP_Factory.h: + * tao/IIOP_Lite_Factory.cpp: + * tao/IIOP_Lite_Factory.h: + * tao/IIOP_Profile.cpp: + * tao/IIOP_Profile.h: + * tao/IIOP_Transport.cpp: + * tao/IIOP_Transport.h: + * tao/IORInterceptor_Adapter.cpp: + * tao/IORInterceptor_Adapter.h: + * tao/IORInterceptor_Adapter_Factory.cpp: + * tao/IORInterceptor_Adapter_Factory.h: + * tao/IOR_Parser.cpp: + * tao/IOR_Parser.h: + * tao/Incoming_Message_Queue.cpp: + * tao/Incoming_Message_Queue.h: + * tao/Incoming_Message_Queue.inl: + * tao/Intrusive_Ref_Count_Base_T.cpp: + * tao/Intrusive_Ref_Count_Base_T.h: + * tao/Intrusive_Ref_Count_Base_T.inl: + * tao/Intrusive_Ref_Count_Handle_T.cpp: + * tao/Intrusive_Ref_Count_Handle_T.h: + * tao/Intrusive_Ref_Count_Handle_T.inl: + * tao/Invocation_Adapter.cpp: + * tao/Invocation_Adapter.h: + * tao/Invocation_Adapter.inl: + * tao/Invocation_Base.cpp: + * tao/Invocation_Base.h: + * tao/Invocation_Base.inl: + * tao/Invocation_Endpoint_Selectors.cpp: + * tao/Invocation_Endpoint_Selectors.h: + * tao/Invocation_Utils.h: + * tao/LF_CH_Event.cpp: + * tao/LF_CH_Event.h: + * tao/LF_Connect_Strategy.cpp: + * tao/LF_Connect_Strategy.h: + * tao/LF_Event.cpp: + * tao/LF_Event.h: + * tao/LF_Event.inl: + * tao/LF_Event_Binder.cpp: + * tao/LF_Event_Binder.h: + * tao/LF_Event_Binder.inl: + * tao/LF_Event_Loop_Thread_Helper.cpp: + * tao/LF_Event_Loop_Thread_Helper.h: + * tao/LF_Event_Loop_Thread_Helper.inl: + * tao/LF_Follower.cpp: + * tao/LF_Follower.h: + * tao/LF_Follower.inl: + * tao/LF_Follower_Auto_Adder.cpp: + * tao/LF_Follower_Auto_Adder.h: + * tao/LF_Follower_Auto_Adder.inl: + * tao/LF_Follower_Auto_Ptr.cpp: + * tao/LF_Follower_Auto_Ptr.h: + * tao/LF_Follower_Auto_Ptr.inl: + * tao/LF_Invocation_Event.cpp: + * tao/LF_Invocation_Event.h: + * tao/LF_Strategy.cpp: + * tao/LF_Strategy.h: + * tao/LF_Strategy_Complete.cpp: + * tao/LF_Strategy_Complete.h: + * tao/LF_Strategy_Complete.inl: + * tao/LRU_Connection_Purging_Strategy.cpp: + * tao/LRU_Connection_Purging_Strategy.h: + * tao/Leader_Follower.cpp: + * tao/Leader_Follower.h: + * tao/Leader_Follower.i: + * tao/Leader_Follower_Flushing_Strategy.cpp: + * tao/Leader_Follower_Flushing_Strategy.h: + * tao/LocalObject.cpp: + * tao/LocalObject.h: + * tao/LocalObject.i: + * tao/LocateRequest_Invocation.cpp: + * tao/LocateRequest_Invocation.h: + * tao/LocateRequest_Invocation_Adapter.cpp: + * tao/LocateRequest_Invocation_Adapter.h: + * tao/MCAST_Parser.cpp: + * tao/MCAST_Parser.h: + * tao/MCAST_Parser.i: + * tao/MProfile.cpp: + * tao/MProfile.h: + * tao/MProfile.i: + * tao/Managed_Types.cpp: + * tao/Managed_Types.h: + * tao/Managed_Types.i: + * tao/Muxed_TMS.cpp: + * tao/Muxed_TMS.h: + * tao/NVList_Adapter.cpp: + * tao/NVList_Adapter.h: + * tao/New_Leader_Generator.cpp: + * tao/New_Leader_Generator.h: + * tao/ORB.cpp: + * tao/ORB.h: + * tao/ORB.i: + * tao/ORBInitializer_Registry.cpp: + * tao/ORBInitializer_Registry.h: + * tao/ORBInitializer_Registry_Adapter.cpp: + * tao/ORBInitializer_Registry_Adapter.h: + * tao/ORB_Constants.h: + * tao/ORB_Core.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.i: + * tao/ORB_Core_Auto_Ptr.cpp: + * tao/ORB_Core_Auto_Ptr.h: + * tao/ORB_Core_Auto_Ptr.inl: + * tao/ORB_Core_TSS_Resources.cpp: + * tao/ORB_Core_TSS_Resources.h: + * tao/ORB_Table.cpp: + * tao/ORB_Table.h: + * tao/ORB_Table.inl: + * tao/Object.cpp: + * tao/Object.h: + * tao/Object.i: + * tao/ObjectKey_Table.cpp: + * tao/ObjectKey_Table.h: + * tao/Object_Argument_T.cpp: + * tao/Object_Argument_T.h: + * tao/Object_Argument_T.inl: + * tao/Object_Loader.cpp: + * tao/Object_Loader.h: + * tao/Object_Proxy_Broker.cpp: + * tao/Object_Proxy_Broker.h: + * tao/Object_Ref_Table.cpp: + * tao/Object_Ref_Table.h: + * tao/Object_Ref_Table.inl: + * tao/Object_T.cpp: + * tao/Object_T.h: + * tao/Objref_VarOut_T.cpp: + * tao/Objref_VarOut_T.h: + * tao/Protocol_Factory.cpp: + * tao/Protocol_Factory.h: + * tao/Resource_Factory.cpp: + * tao/Resource_Factory.h: + * tao/Stub_Factory.cpp: + * tao/Stub_Factory.h: + * tao/Thread_Lane_Resources_Manager.h: + * tao/corba.h: + * tao/corbafwd.cpp: + * tao/debug.cpp: + * tao/debug.h: + * tao/default_client.cpp: + * tao/default_client.h: + * tao/default_environment.h: + * tao/default_resource.cpp: + * tao/default_resource.h: + * tao/default_server.cpp: + * tao/objectid.h: + * tao/operation_details.cpp: + * tao/operation_details.h: + * tao/operation_details.i: + * tao/orbconf.h: + + Added versioned namespace support. + + Removed some empty and/or unnecessary `.cpp' and `.inl' files. + + Improved exception safety in some assignment operators. + Tue Nov 1 14:27:36 USMST 2005 Yan Dai <dai_y@ociweb.com> * examples/CSD_Strategy/ThreadPool/run_test.pl: diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp index adc1b27ec4a..1e48a102f8c 100644 --- a/TAO/tao/Abstract_Servant_Base.cpp +++ b/TAO/tao/Abstract_Servant_Base.cpp @@ -6,6 +6,8 @@ ACE_RCSID (tao, Abstract_Servant_Base, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void) { // No-Op. @@ -25,3 +27,5 @@ TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstra { return *this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 3ff31187f77..f84b36f3630 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -32,6 +32,8 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ServerRequest; class TAO_Stub; class TAO_Abstract_ServantBase; @@ -169,6 +171,7 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp index 2a7ca91f360..e0412bc4c07 100644 --- a/TAO/tao/Acceptor_Filter.cpp +++ b/TAO/tao/Acceptor_Filter.cpp @@ -4,7 +4,10 @@ ACE_RCSID(tao, Acceptor_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h index aab2bad47fb..bfb1a189dd0 100644 --- a/TAO/tao/Acceptor_Filter.h +++ b/TAO/tao/Acceptor_Filter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class ObjectKey; @@ -62,5 +64,7 @@ public: virtual int encode_endpoints (TAO_MProfile &mprofile) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ACCEPTOR_FILTER_H */ diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index 2286ae6c4fd..408fa54548f 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -33,9 +33,7 @@ #include "Transport.h" #include "debug.h" -ACE_RCSID (tao, - Acceptor_Impl, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////////////////////////////////////////////////////////////// @@ -213,4 +211,6 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_H ///////////////////////////////////////////////////////////////////// +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ACCEPTOR_IMPL_CPP */ diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h index ac978b8167d..1d2b60e3505 100644 --- a/TAO/tao/Acceptor_Impl.h +++ b/TAO/tao/Acceptor_Impl.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,8 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class TAO_ORB_Core; @@ -105,6 +107,8 @@ protected: TAO_ORB_Core *orb_core_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Acceptor_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 4e440dc9dc1..4be1b0d7920 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -31,6 +31,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Acceptor_Registry::TAO_Acceptor_Registry (void) : acceptors_ (0), size_ (0) @@ -893,3 +895,5 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index e51d9b32846..6c3ddf97b79 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -27,6 +27,8 @@ #include "tao/Exception.h" #include "tao/params.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class ACE_Addr; class ACE_Reactor; @@ -134,9 +136,10 @@ private: ACE_ENV_ARG_DECL); private: + // The acceptor registry should not be copied. - ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry&)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Acceptor_Registry&)) + TAO_Acceptor_Registry (const TAO_Acceptor_Registry&); + void operator= (const TAO_Acceptor_Registry&); private: /// List of acceptors that are currently open. @@ -146,6 +149,8 @@ private: size_t size_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "tao/Acceptor_Registry.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i index 4a98e902fc1..b086cbf1c1b 100644 --- a/TAO/tao/Acceptor_Registry.i +++ b/TAO/tao/Acceptor_Registry.i @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_AcceptorSetIterator TAO_Acceptor_Registry::begin (void) { @@ -12,3 +15,5 @@ TAO_Acceptor_Registry::end (void) { return this->acceptors_ + this->size_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index f7eabbc56c0..274ca2fa5f8 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -6,7 +6,10 @@ ACE_RCSID (tao, Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Adapter::~TAO_Adapter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 5740575de0c..c24b6243f42 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -24,6 +24,8 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { typedef TAO_Pseudo_Var_T<Object> Object_var; @@ -108,6 +110,8 @@ public: CORBA::Object_ptr) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ADAPTER_H */ diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp index 99c8ea348d9..16bad03fa2b 100644 --- a/TAO/tao/Adapter_Factory.cpp +++ b/TAO/tao/Adapter_Factory.cpp @@ -4,7 +4,10 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Adapter_Factory::~TAO_Adapter_Factory (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h index fc4d8d13b82..8fa53f30628 100644 --- a/TAO/tao/Adapter_Factory.h +++ b/TAO/tao/Adapter_Factory.h @@ -16,12 +16,18 @@ #include /**/ "ace/pre.h" #include "tao/TAO_Export.h" -#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +#include "ace/Service_Object.h" + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Adapter; class TAO_ORB_Core; @@ -35,6 +41,8 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index e55792bc2a5..be2cd1c767b 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -13,6 +13,8 @@ ACE_RCSID (tao, Adapter_Registry, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc) : orb_core_ (oc), adapters_capacity_ (16), // @@ Make it configurable @@ -193,3 +195,4 @@ TAO_Adapter_Registry::find_adapter (const char *name) const } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index e184f1a81ca..b5927dfaab6 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -29,6 +29,8 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { typedef TAO_Pseudo_Var_T<Object> Object_var; @@ -113,6 +115,8 @@ private: //@} }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h index 65d0465d4fe..ec6567fc0dd 100644 --- a/TAO/tao/Allocator.h +++ b/TAO/tao/Allocator.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -19,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -40,5 +44,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ALLOCATOR_H */ diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp index ef7e0adf569..d9da63d780f 100644 --- a/TAO/tao/AnyTypeCode_Adapter.cpp +++ b/TAO/tao/AnyTypeCode_Adapter.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "tao/AnyTypeCode_Adapter.h" @@ -6,7 +6,10 @@ ACE_RCSID (tao, TAO_AnyTypeCode_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index 5050a148c32..a232e328551 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -27,6 +27,8 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class TypeCode; @@ -122,5 +124,7 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANYTYPECODE_ADAPTER */ diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h index 48b71281704..dd742fef986 100644 --- a/TAO/tao/Any_Insert_Policy_T.h +++ b/TAO/tao/Any_Insert_Policy_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -29,6 +29,8 @@ #include "tao/debug.h" #include "tao/IFR_Client_Adapter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { template <typename S> @@ -110,5 +112,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_ANY_INSERT_POLICY_H */ diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h index e384db4a2ad..f71e79b2f27 100644 --- a/TAO/tao/Arg_Traits_T.h +++ b/TAO/tao/Arg_Traits_T.h @@ -19,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -32,6 +34,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ARG_TRAITS_T_H */ diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index 98e0861d980..d1819d1cc51 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -3,6 +3,8 @@ #include "tao/Argument.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Argument::~Argument (void) { } @@ -52,4 +54,4 @@ TAO::RetArgument::mode (void) const #endif /* TAO_HAS_INTERCEPTORS */ - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index edad3568278..cbaee13f83d 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -6,7 +6,8 @@ * * $Id$ * - * @authors Jeff Parsons and Carlos O'Ryan + * @author Jeff Parsons + * @author Carlos O'Ryan */ //============================================================================= @@ -26,6 +27,8 @@ #include "tao/TAO_Export.h" #include "tao/ParameterModeC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -123,6 +126,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ARGUMENT_H */ diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index 63093981053..712ee76a20a 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ARRAY_VAROUT_T_C -#define TAO_ARRAY_VAROUT_T_C +#ifndef TAO_ARRAY_VAROUT_T_CPP +#define TAO_ARRAY_VAROUT_T_CPP #include "tao/Array_VarOut_T.h" @@ -9,9 +9,8 @@ #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Array_VarOut_T, - "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T, typename T_slice, typename TAG> TAO_FixedArray_Var_T<T,T_slice,TAG> & @@ -91,4 +90,6 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor ( TAO::Array_Traits<T,T_slice,TAG>::free (tmp); } -#endif /* TAO_ARRAY_VAROUT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_ARRAY_VAROUT_T_CPP */ diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index f2e07430c24..86ce5168d73 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -201,6 +203,8 @@ private: const CORBA::Boolean nocopy_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index f0837b64e71..6be6b641283 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -2,6 +2,8 @@ // //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (void) @@ -409,3 +411,5 @@ TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void) { return TAO::Array_Traits<T,T_slice,TAG>::alloc (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 0f10cddbe1f..457b875e91d 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -14,6 +14,7 @@ ACE_RCSID (tao, Asynch_Queued_Message, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message ( const ACE_Message_Block *contents, @@ -181,3 +182,5 @@ TAO_Asynch_Queued_Message::destroy (void) } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp index 3fdcb0239aa..1f01eca39f6 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -14,6 +14,8 @@ ACE_RCSID (tao, Asynch_Reply_Dispatcher_Base, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Constructor. TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base ( TAO_ORB_Core *orb_core, @@ -144,3 +146,5 @@ TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void) return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ea4c156ba22..cea5b8de1cb 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- + //============================================================================= /** * @file Asynch_Reply_Dispatcher_Base.h @@ -24,6 +25,8 @@ #include "tao/IOP_IORC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Pluggable_Reply_Params; class TAO_ORB_Core ; class ACE_Time_Value; @@ -156,6 +159,8 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Asynch_Reply_Dispatcher_Base.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.i b/TAO/tao/Asynch_Reply_Dispatcher_Base.i index af9c34d4242..c63371d74a4 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.i +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ACE_INLINE void @@ -10,3 +14,5 @@ namespace TAO (void) ardb->decr_refcount (); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Auto_Functor.h b/TAO/tao/Auto_Functor.h index 3fc7a857e5a..a764aea0e3d 100644 --- a/TAO/tao/Auto_Functor.h +++ b/TAO/tao/Auto_Functor.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file Auto_Functor.h @@ -20,6 +21,8 @@ #include "ace/Auto_Functor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Utils @@ -30,5 +33,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_AUTO_FUNCTOR_H*/ diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index 2734394a30f..4e9e4d2201c 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_BD_STRING_ARGUMENT_T_C -#define TAO_BD_STRING_ARGUMENT_T_C +#ifndef TAO_BD_STRING_ARGUMENT_T_CPP +#define TAO_BD_STRING_ARGUMENT_T_CPP #include "tao/BD_String_Argument_T.h" @@ -9,9 +9,7 @@ #include "tao/BD_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - BD_String_Argument_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, @@ -153,4 +151,6 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::intercep #endif /* TAO_HAS_INTERCEPTORS */ -#endif /* TAO_BD_STRING_ARGUMENT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_BD_STRING_ARGUMENT_T_CPP */ diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 7a2fdc4eddd..7c73638e991 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -25,6 +25,8 @@ #include "tao/Argument.h" #include "tao/Any_Insert_Policy_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -198,6 +200,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/BD_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index a21a1e227b7..d222489a42c 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename to_S, typename from_S, @@ -129,3 +133,4 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::arg (voi return this->x_.out (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp index 75b3d08349c..121aea34b89 100644 --- a/TAO/tao/Base_Transport_Property.cpp +++ b/TAO/tao/Base_Transport_Property.cpp @@ -11,11 +11,12 @@ ACE_RCSID (tao, Base_Transport_Property, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void) { } - TAO_Transport_Descriptor_Interface * TAO_Base_Transport_Property::duplicate (void) { @@ -53,3 +54,5 @@ TAO_Base_Transport_Property::hash (void) const { return this->endpoint_->hash (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h index b781ac40232..954c7e7bb83 100644 --- a/TAO/tao/Base_Transport_Property.h +++ b/TAO/tao/Base_Transport_Property.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ // =================================================================== @@ -24,6 +25,8 @@ #include "tao/Endpoint.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Base_Transport_Property * @@ -64,6 +67,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Base_Transport_Property.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl index fa4bd7f6b19..3c097130fd4 100644 --- a/TAO/tao/Base_Transport_Property.inl +++ b/TAO/tao/Base_Transport_Property.inl @@ -1,6 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Base_Transport_Property::TAO_Base_Transport_Property (void) { @@ -24,3 +27,5 @@ TAO_Base_Transport_Property::TAO_Base_Transport_Property ( { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp index f798eb09887..ae34d1062d0 100644 --- a/TAO/tao/Basic_Argument_T.cpp +++ b/TAO/tao/Basic_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_BASIC_ARGUMENT_T_C -#define TAO_BASIC_ARGUMENT_T_C +#ifndef TAO_BASIC_ARGUMENT_T_CPP +#define TAO_BASIC_ARGUMENT_T_CPP #include "tao/Basic_Argument_T.h" @@ -9,9 +9,7 @@ #include "tao/Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Basic_Argument_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename Insert_Policy> CORBA::Boolean @@ -98,4 +96,6 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) #endif /* TAO_HAS_INTERCEPTORS */ -#endif /* TAO_BASIC_ARGUMENT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_BASIC_ARGUMENT_T_CPP */ diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index cc7bcb388b3..8558ce45bf6 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -154,6 +156,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index d11f01533bd..c8df439d593 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename Insert_Policy> ACE_INLINE TAO::In_Basic_Argument_T<S, Insert_Policy>::In_Basic_Argument_T (S const & x) @@ -78,3 +82,4 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void) return this->x_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h index 155d66c651e..8993e1accd5 100644 --- a/TAO/tao/Basic_Arguments.h +++ b/TAO/tao/Basic_Arguments.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #include "tao/Arg_Traits_T.h" #include "tao/Any_Insert_Policy_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -107,6 +109,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_BASIC_ARGUMENTS_H */ diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h index b2d8d652926..7c37004b3d3 100644 --- a/TAO/tao/Basic_Types.h +++ b/TAO/tao/Basic_Types.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { /** @@ -84,6 +88,8 @@ namespace CORBA class TAO_InputCDR; class TAO_OutputCDR; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_BASIC_TYPES_H */ diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp index 90b60d1b393..b564942d5db 100644 --- a/TAO/tao/BiDir_Adapter.cpp +++ b/TAO/tao/BiDir_Adapter.cpp @@ -1,10 +1,13 @@ -// @(#) $Id$ +// $Id$ #include "tao/BiDir_Adapter.h" ACE_RCSID(tao, BiDir_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index ebf1e5675dc..fd5270b769c 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_Policy_Validator; @@ -50,5 +52,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_BIDIR_ADAPTER_H */ diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp index 9466a58fe3e..c88d3af1783 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.cpp +++ b/TAO/tao/Bind_Dispatcher_Guard.cpp @@ -11,6 +11,8 @@ ACE_RCSID (tao, Bind_Dispatcher_Guard, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard ( CORBA::ULong request_id, TAO_Reply_Dispatcher* rd, @@ -36,3 +38,5 @@ TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void) if (this->status_ == TAO_Bind_Dispatcher_Guard::UNBIND) (void) this->tms_->unbind_dispatcher (this->request_id_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h index e4c992b8ab6..ae86b126b92 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.h +++ b/TAO/tao/Bind_Dispatcher_Guard.h @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- + //============================================================================= /** * @file Bind_Dispatcher_Guard.h @@ -18,6 +19,8 @@ #include "tao/Basic_Types.h" #include "tao/TAO_Export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Reply_Dispatcher; class TAO_Transport_Mux_Strategy; @@ -55,6 +58,8 @@ private: TAO_Transport_Mux_Strategy* tms_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Bind_Dispatcher_Guard.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Bind_Dispatcher_Guard.i b/TAO/tao/Bind_Dispatcher_Guard.i index 64bce7bf6f6..f5ccc4a8d23 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.i +++ b/TAO/tao/Bind_Dispatcher_Guard.i @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- +// // $Id$ // =========================================================================== @@ -15,6 +16,7 @@ #include "tao/Reply_Dispatcher.h" #include "tao/Transport_Mux_Strategy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void TAO_Bind_Dispatcher_Guard::status (int s) @@ -40,3 +42,5 @@ TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void) return retval; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp index 96a6b3f12d1..e06a0c2dc6d 100644 --- a/TAO/tao/Block_Flushing_Strategy.cpp +++ b/TAO/tao/Block_Flushing_Strategy.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "Block_Flushing_Strategy.h" @@ -7,6 +6,8 @@ ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Block_Flushing_Strategy::schedule_output (TAO_Transport *transport) { @@ -50,3 +51,5 @@ TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport) } return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h index 4c917bc2671..7a157c5cf34 100644 --- a/TAO/tao/Block_Flushing_Strategy.h +++ b/TAO/tao/Block_Flushing_Strategy.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Block_Flushing_Strategy * @@ -36,5 +38,7 @@ public: virtual int flush_transport (TAO_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_BLOCK_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp index a7d50c3d307..e8817a80561 100644 --- a/TAO/tao/Blocked_Connect_Strategy.cpp +++ b/TAO/tao/Blocked_Connect_Strategy.cpp @@ -7,6 +7,7 @@ ACE_RCSID(tao, Blocked_Connect_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Blocked_Connect_Strategy::TAO_Blocked_Connect_Strategy ( TAO_ORB_Core *orb_core) @@ -53,3 +54,5 @@ TAO_Blocked_Connect_Strategy::wait (TAO_Transport *, // We cannot wait for connection completion return -1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h index 87016f0470f..70e506b7da7 100644 --- a/TAO/tao/Blocked_Connect_Strategy.h +++ b/TAO/tao/Blocked_Connect_Strategy.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Blocked_Connect_Strategy * @@ -51,6 +53,7 @@ public: ACE_Time_Value *val); }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_BLOCKED_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp index 34a0aa19550..52ae87f3c33 100644 --- a/TAO/tao/Buffer_Allocator_T.cpp +++ b/TAO/tao/Buffer_Allocator_T.cpp @@ -6,6 +6,9 @@ #include "tao/Buffer_Allocator_T.h" #include "ace/Global_Macros.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { template <typename handler_type, typename alloc_type> @@ -37,4 +40,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_BUFFER_ALLOCATOR_T_CPP */ diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index 59684723965..3d29c153ac9 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -21,6 +21,8 @@ #include "tao/Allocator.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -46,6 +48,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Buffer_Allocator_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index f3e97bfc0d3..8f1ae69c489 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -16,6 +16,8 @@ ACE_RCSID (tao, #include "tao/Buffering_Constraint_Policy.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint) : ACE_NESTED_CLASS (CORBA, Object) () , ACE_NESTED_CLASS (CORBA, Policy) () @@ -86,4 +88,6 @@ TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index d94271eeca4..f6b336801cc 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Buffering_Constraint_Policy.h @@ -30,6 +31,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Buffering_Constraint_Policy * @@ -74,6 +77,8 @@ private: TAO::BufferingConstraint buffering_constraint_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i index aa5203cb743..2176d0efc36 100644 --- a/TAO/tao/Buffering_Constraint_Policy.i +++ b/TAO/tao/Buffering_Constraint_Policy.i @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_Buffering_Constraint_Policy::get_buffering_constraint (TAO::BufferingConstraint &bc) const { bc = this->buffering_constraint_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index ccc993ff3b0..bc48f9f0126 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -44,6 +44,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_CDR_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_OutputCDR::TAO_OutputCDR (size_t size, int byte_order, ACE_Allocator *buffer_allocator, @@ -229,3 +231,5 @@ TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 91ebea856a1..d06f563a582 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- + //============================================================================= /** * @file CDR.h @@ -54,6 +55,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; namespace CORBA @@ -339,5 +342,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::WChar* &x); #endif /* __ACE_INLINE */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CDR_H */ diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i index a4081309dc6..a7dcf134c77 100644 --- a/TAO/tao/CDR.i +++ b/TAO/tao/CDR.i @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_OutputCDR::~TAO_OutputCDR (void) { @@ -286,3 +288,5 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, { return static_cast<ACE_InputCDR &> (is) >> x; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index a65f0a25f07..44babb5e141 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -20,10 +20,6 @@ ACE_RCSID (tao, CORBALOC_Parser, "$Id$") -TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) -{ -} - static const char prefix[] = "corbaloc:"; static const size_t prefix_len = sizeof prefix - 1; static const char rir_token[] = "rir:"; @@ -31,6 +27,12 @@ static const size_t rir_token_len = sizeof rir_token - 1; static const char iiop_token[] = "iiop:"; static const char iiop_token_len = sizeof iiop_token - 1; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) +{ +} + int TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const { @@ -374,6 +376,8 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, canonical_endpoint += raw_port; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser, ACE_TEXT ("CORBALOC_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index df1d73c4715..c99631771ae 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -27,8 +27,9 @@ #include "tao/Profile.h" #include "ace/SString.h" -class TAO_MProfile; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_MProfile; /** * @class TAO_CORBALOC_Parser @@ -40,7 +41,7 @@ class TAO_MProfile; * string to separate the individual <obj_addr> from the list of object * addresses <obj_addr_list>. */ -class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser +class TAO_CORBALOC_Parser : public TAO_IOR_Parser { public: /// Constructor @@ -92,6 +93,8 @@ private: }; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CORBALOC_Parser.i b/TAO/tao/CORBALOC_Parser.i index fddafd15c3f..53f39cf5a05 100644 --- a/TAO/tao/CORBALOC_Parser.i +++ b/TAO/tao/CORBALOC_Parser.i @@ -1,13 +1,16 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CORBALOC_Parser::TAO_CORBALOC_Parser (void) { } ACE_INLINE -TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint(void) +TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint (void) : profile_ (0) { } @@ -18,3 +21,5 @@ TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void) if (this->profile_ != 0) this->profile_->_decr_refcnt(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 649edfb1408..91df382a322 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -8,10 +8,6 @@ #include "Invocation_Adapter.h" #include "debug.h" -#if !defined(__ACE_INLINE__) -#include "CORBANAME_Parser.i" -#endif /* __ACE_INLINE__ */ - #include "ace/Log_Msg.h" #include "ace/SString.h" #include "ace/OS_NS_string.h" @@ -21,13 +17,14 @@ ACE_RCSID (tao, CORBANAME_Parser, "$Id$") +static const char corbaname_prefix[] = "corbaname:"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void) { } -static const char corbaname_prefix[] = "corbaname:"; - int TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const { @@ -158,6 +155,8 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, return obj; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser, ACE_TEXT ("CORBANAME_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index 5f1f66cf8db..9580d770885 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +24,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CORBANAME_Parser * @@ -33,11 +36,9 @@ * to a naming service at the given address and port and then resolve an * object in that context. */ -class TAO_Export TAO_CORBANAME_Parser : public TAO_IOR_Parser +class TAO_CORBANAME_Parser : public TAO_IOR_Parser { public: - /// Constructor - TAO_CORBANAME_Parser (void); /// The destructor virtual ~TAO_CORBANAME_Parser (void); @@ -58,9 +59,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined (__ACE_INLINE__) -# include "CORBANAME_Parser.i" -#endif /* __ACE_INLINE__ */ +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser) ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser) diff --git a/TAO/tao/CORBANAME_Parser.i b/TAO/tao/CORBANAME_Parser.i deleted file mode 100644 index 1139a868437..00000000000 --- a/TAO/tao/CORBANAME_Parser.i +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -ACE_INLINE -TAO_CORBANAME_Parser::TAO_CORBANAME_Parser (void) -{ -} diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 0511d23755a..f8889735ce5 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -16,6 +16,8 @@ ACE_RCSID (tao, CORBA_String, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + char * CORBA::string_dup (const char *str) { @@ -74,7 +76,7 @@ CORBA::wstring_dup (const WChar *const str) return 0; } - CORBA::WChar* retval = + CORBA::WChar* retval = CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str))); // The wscpy() below assumes that the destination is a valid buffer. @@ -273,7 +275,7 @@ operator>> (istream &is, CORBA::String_out &so) ostream & operator<< (ostream &os, const CORBA::WString_var &wsv) { - const CORBA::ULong len = + const CORBA::ULong len = static_cast <CORBA::ULong> (ACE_OS::strlen (wsv.in ())); for (CORBA::ULong i = 0; i < len; ++i) @@ -349,3 +351,5 @@ operator>> (istream &is, CORBA::WString_out &wso) } #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index dec64106c43..d4c8f58fa51 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -26,6 +26,8 @@ // For the (W)String_var and (W)String_out iostream operators. #include "ace/iosfwd.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_String_Manager; class TAO_WString_Manager; @@ -331,6 +333,8 @@ operator>> (istream &, CORBA::WString_out &); # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/CORBA_String.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl index 992044b1bb4..90433d8095b 100644 --- a/TAO/tao/CORBA_String.inl +++ b/TAO/tao/CORBA_String.inl @@ -10,6 +10,8 @@ // #include "ace/OS_NS_wchar.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::String_var::String_var (void) : ptr_ (0) @@ -289,3 +291,5 @@ TAO::String_Var_Equal_To::operator() (CORBA::WString_var const & lhs, { return (ACE_OS::strcmp (lhs.in (), rhs.in ()) == 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Cache_Entries.cpp b/TAO/tao/Cache_Entries.cpp index b4540ba96b3..99ecb2ad72b 100644 --- a/TAO/tao/Cache_Entries.cpp +++ b/TAO/tao/Cache_Entries.cpp @@ -13,6 +13,8 @@ ACE_RCSID(tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Cache_IntId::Cache_IntId (TAO_Transport *transport) @@ -46,3 +48,5 @@ namespace TAO return *this; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h index eea2967b2fc..993cc36de11 100644 --- a/TAO/tao/Cache_Entries.h +++ b/TAO/tao/Cache_Entries.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Transport; @@ -197,6 +197,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Cache_Entries.inl" diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl index 711f635b20e..475f8865a0d 100644 --- a/TAO/tao/Cache_Entries.inl +++ b/TAO/tao/Cache_Entries.inl @@ -1,6 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ACE_INLINE @@ -188,3 +191,5 @@ namespace TAO return this->transport_property_; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp index 0c574d13b87..d9f2b510c78 100644 --- a/TAO/tao/Cleanup_Func_Registry.cpp +++ b/TAO/tao/Cleanup_Func_Registry.cpp @@ -10,21 +10,14 @@ ACE_RCSID (tao, Cleanup_Func_Registry, "$Id$") -TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) - : cleanup_funcs_ () -{ -} - -TAO_Cleanup_Func_Registry::~TAO_Cleanup_Func_Registry (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_Cleanup_Func_Registry::register_cleanup_function ( ACE_CLEANUP_FUNC func, size_t &slot_id) { - size_t slot = this->cleanup_funcs_.size (); + size_t const slot = this->cleanup_funcs_.size (); if (this->cleanup_funcs_.size (slot + 1) != 0) return -1; @@ -38,7 +31,7 @@ TAO_Cleanup_Func_Registry::register_cleanup_function ( void TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects) { - size_t len = ts_objects.size (); + size_t const len = ts_objects.size (); // The allocated slot may never have been used. It is therefore // possible that the TSS array size may be less than the cleanup @@ -56,3 +49,4 @@ TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects) } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index 6d42d4342ec..1f497887a41 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -15,14 +15,19 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Array_Base.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Cleanup_Func_Registry * @@ -32,18 +37,15 @@ * invoking the corresponding cleanup function on each object. Hence, * there is a tight coupling between this class and the TAO ORB Core. */ -class TAO_Export TAO_Cleanup_Func_Registry +class TAO_Cleanup_Func_Registry { friend class TAO_ORB_Core; public: - /// Constructor + /// Constructor. TAO_Cleanup_Func_Registry (void); - /// Destructor - ~TAO_Cleanup_Func_Registry (void); - /// Return the number of registered cleanup functions. size_t size (void) const; @@ -65,9 +67,8 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. - ACE_UNIMPLEMENTED_FUNC ( - TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Cleanup_Func_Registry &)) + TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &); + void operator= (const TAO_Cleanup_Func_Registry &); private: @@ -79,6 +80,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Cleanup_Func_Registry.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl index 1e2a8362075..2216dce7c34 100644 --- a/TAO/tao/Cleanup_Func_Registry.inl +++ b/TAO/tao/Cleanup_Func_Registry.inl @@ -2,8 +2,18 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +ACE_INLINE +TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) + : cleanup_funcs_ () +{ +} + ACE_INLINE size_t TAO_Cleanup_Func_Registry::size (void) const { return this->cleanup_funcs_.size (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp index 1bf7fb37f7b..5788e639226 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp @@ -4,11 +4,10 @@ ACE_RCSID (tao, ClientInterceptorAdapter, "$Id$") -namespace TAO +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void) { - ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void) - { - } } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 7ccb34738c9..e05d9bf63a6 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -30,6 +30,8 @@ #include "tao/SystemException.h" #include "tao/Invocation_Utils.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ClientRequestInfo; namespace PortableInterceptor @@ -101,6 +103,9 @@ namespace TAO }; } + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CLIENT_REQUEST_INTERCEPTOR_ADAPTER_H */ diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp index 0aa32cabbc2..6dab162930d 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp @@ -4,7 +4,10 @@ ACE_RCSID (tao, ClientRequestInterceptorAdapterFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h index f9878697bb9..805608c2af0 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,8 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Service_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -44,6 +47,8 @@ public: virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CLIENTREQUESTINTERCEPTOR_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp index ba7d37b5612..f459955e2bf 100644 --- a/TAO/tao/Client_Strategy_Factory.cpp +++ b/TAO/tao/Client_Strategy_Factory.cpp @@ -4,9 +4,7 @@ ACE_RCSID(tao, Client_Strategy_Factory, "$Id$") -TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void) { @@ -65,3 +63,5 @@ TAO_Client_Strategy_Factory::use_cleanup_options (void) const { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index fa3ec2eb1b4..86bd88b3b1c 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -13,15 +13,21 @@ #ifndef TAO_CLIENT_STRATEGY_FACTORY_H #define TAO_CLIENT_STRATEGY_FACTORY_H + #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" +#include "tao/Versioned_Namespace.h" + +#include "ace/Service_Object.h" + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; class TAO_Transport_Mux_Strategy; @@ -39,9 +45,6 @@ class TAO_Connect_Strategy; class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object { public: - // = Intialization and termination methods. - /// Constructor. - TAO_Client_Strategy_Factory (void); /// Destructor virtual ~TAO_Client_Strategy_Factory (void); @@ -80,5 +83,7 @@ public: virtual bool use_cleanup_options (void) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CLIENT_STRATEGY_FACTORY_H */ diff --git a/TAO/tao/Codeset_Descriptor_Base.h b/TAO/tao/Codeset_Descriptor_Base.h index 83f9b77e70c..201de5e9bd3 100644 --- a/TAO/tao/Codeset_Descriptor_Base.h +++ b/TAO/tao/Codeset_Descriptor_Base.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* * TAO_Codeset_Descriptor_Base describes the necessary interface for * Objects within libTAO to be able to supply information to the codeset @@ -32,12 +36,14 @@ class TAO_Export TAO_Codeset_Descriptor_Base { public: - virtual ~TAO_Codeset_Descriptor_Base (); + virtual ~TAO_Codeset_Descriptor_Base (void); virtual void ncs (const ACE_TCHAR *name) = 0; virtual void add_translator (const ACE_TCHAR *name) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CODESET_DESCRIPTOR_BASE_H */ diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 9744abc08b7..99e61a67509 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -7,14 +7,17 @@ ACE_RCSID (tao, Codeset_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Manager::~TAO_Codeset_Manager () +TAO_Codeset_Manager::~TAO_Codeset_Manager (void) { } -// Add the default destructor for the codeset_descriptor_base here, because +// Add the destructor for the codeset_descriptor_base here, because // it is only ever used in conjunction with the codeset manager. -TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base () +TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h index 67590e97f64..20c6bafe044 100644 --- a/TAO/tao/Codeset_Manager.h +++ b/TAO/tao/Codeset_Manager.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /* @@ -8,7 +8,7 @@ * * Interface for the TAO CodeSet Manager. * - * @author Mahesh Vedantam <mahesh#ociweb.com> + * @author Mahesh Vedantam <mahesh@ociweb.com> */ //============================================================================= @@ -17,13 +17,15 @@ #include /**/ "ace/pre.h" -#include "tao/CONV_FRAMEC.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" +#include "tao/CONV_FRAMEC.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_WChar_Codeset_Translator; @@ -55,12 +57,13 @@ class TAO_Codeset_Descriptor_Base; * context attached to the first request sent on the new connection. * */ - class TAO_Export TAO_Codeset_Manager { public: - virtual ~TAO_Codeset_Manager(); + + /// Destructor. + virtual ~TAO_Codeset_Manager (void); /// Called by an object of TAO_Acceptor to set NCS and CCS values for /// Char/Wchar in to the Object Reference. @@ -91,6 +94,8 @@ public: CONV_FRAME::CodeSetId &ncsw) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CODESET_MANAGER_H */ diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index a4ed7de44d8..588bdcc2037 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -8,18 +8,20 @@ ACE_RCSID (tao, Codeset_Manager_Factory_Base, "$Id$") -TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base () +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void) { } int -TAO_Codeset_Manager_Factory_Base::is_default() const +TAO_Codeset_Manager_Factory_Base::is_default (void) const { return 1; } TAO_Codeset_Manager * -TAO_Codeset_Manager_Factory_Base::create () +TAO_Codeset_Manager_Factory_Base::create (void) { return 0; @@ -32,6 +34,8 @@ TAO_Codeset_Manager_Factory_Base::initialize (void) (ace_svc_desc_TAO_Codeset_Manager_Factory_Base); } +TAO_END_VERSIONED_NAMESPACE_DECL + static int TAO_Requires_Codeset_Manager_Factory_Base = TAO_Codeset_Manager_Factory_Base::initialize (); diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h index e69278db28c..88d8a47948c 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.h +++ b/TAO/tao/Codeset_Manager_Factory_Base.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /* @@ -8,7 +8,7 @@ * * Interface for the TAO CodeSet Manager. * - * @author Mahesh Vedantam <mahesh#ociweb.com> + * @author Mahesh Vedantam <mahesh@ociweb.com> */ //============================================================================= @@ -17,14 +17,19 @@ #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" -#include "ace/Service_Config.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +#include "ace/Service_Object.h" +#include "ace/Service_Config.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Codeset_Manager; /** @@ -58,6 +63,8 @@ public: static int initialize (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory_Base) ACE_FACTORY_DECLARE (TAO, TAO_Codeset_Manager_Factory_Base) diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp index c5d222373b2..bb4691a33d2 100644 --- a/TAO/tao/Codeset_Translator_Base.cpp +++ b/TAO/tao/Codeset_Translator_Base.cpp @@ -23,7 +23,11 @@ ACE_RCSID (tao, Codeset_Translator_Base, "$Id$") -TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base () +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h index cb87201e9ce..4b2e50d2b86 100644 --- a/TAO/tao/Codeset_Translator_Base.h +++ b/TAO/tao/Codeset_Translator_Base.h @@ -8,13 +8,14 @@ * * @author Phil Mesnier <mesnier_p@ociweb.com> */ -// ========================= +// =================================================================== #ifndef TAO_CODESET_TRANSLATOR_BASE_H #define TAO_CODESET_TRANSLATOR_BASE_H #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +23,9 @@ #include "tao/CONV_FRAMEC.h" #include "tao/Codeset_Translator_Base.h" -#include "TAO_Export.h" +#include "ace/Service_Object.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_InputCDR; class TAO_OutputCDR; @@ -68,5 +71,8 @@ public: virtual void assign (TAO_OutputCDR *) const = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_Codeset_Translator_Base */ diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp index 135a1fb1b91..f3b08462ad9 100644 --- a/TAO/tao/Collocated_Invocation.cpp +++ b/TAO/tao/Collocated_Invocation.cpp @@ -15,6 +15,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Collocated_Invocation::Collocated_Invocation (CORBA::Object_ptr t, @@ -164,3 +166,5 @@ namespace TAO } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h index 03068bcb8fb..0dcc7be999c 100644 --- a/TAO/tao/Collocated_Invocation.h +++ b/TAO/tao/Collocated_Invocation.h @@ -25,6 +25,8 @@ #include "tao/Invocation_Base.h" #include "tao/Exception.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Details; class TAO_Stub; @@ -90,5 +92,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_COLLOCATED_INVOCATION_H*/ diff --git a/TAO/tao/Collocation_Proxy_Broker.cpp b/TAO/tao/Collocation_Proxy_Broker.cpp index b1d780feccf..e9a228532b4 100644 --- a/TAO/tao/Collocation_Proxy_Broker.cpp +++ b/TAO/tao/Collocation_Proxy_Broker.cpp @@ -8,6 +8,10 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Collocation_Proxy_Broker::~Collocation_Proxy_Broker (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h index 420ddec654f..3da552f68a7 100644 --- a/TAO/tao/Collocation_Proxy_Broker.h +++ b/TAO/tao/Collocation_Proxy_Broker.h @@ -22,10 +22,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Collocation_Strategy.h" +#include "tao/Versioned_Namespace.h" + #include "ace/CORBA_macros.h" #include "ace/os_include/os_stddef.h" -#include "tao/Collocation_Strategy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> class TAO_Pseudo_Var_T; template <typename T, typename T_var> class TAO_Pseudo_Out_T; @@ -65,6 +68,8 @@ namespace TAO Collocation_Strategy strategy ACE_ENV_ARG_DECL) = 0; }; + +TAO_END_VERSIONED_NAMESPACE_DECL } #include /**/ "ace/post.h" diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp index 1f752fccc89..23d15bfc269 100644 --- a/TAO/tao/Collocation_Resolver.cpp +++ b/TAO/tao/Collocation_Resolver.cpp @@ -1,13 +1,15 @@ // $Id$ #include "tao/Collocation_Resolver.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Collocation_Resolver, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index 46c6466ff47..b837f9acf15 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Collocation_Resolver.h @@ -12,16 +14,19 @@ #define TAO_COLLOCATION_RESOLVER_H #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Basic_Types.h" + +#include "ace/Service_Object.h" #include "ace/CORBA_macros.h" -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -52,6 +57,8 @@ public: ACE_ENV_ARG_DECL) const = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_COLLOCATION_RESOLVER_H */ diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index 5fb831711cb..454880a3049 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -1,3 +1,5 @@ +// $Id$ + #ifndef TAO_CONDITION_CPP #define TAO_CONDITION_CPP #include "Condition.h" @@ -8,9 +10,7 @@ #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO, - Condition, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class MUTEX> TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m) @@ -57,4 +57,6 @@ TAO_Condition<MUTEX>::~TAO_Condition (void) delete this->mutex_; } -#endif /* TAO_CONDITION_CPP*/ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_CONDITION_CPP */ diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index c167bf85e0b..7724a113b75 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -24,8 +24,9 @@ #include "ace/Condition_T.h" #include "ace/Global_Macros.h" -class ACE_Time_Value; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Time_Value; /** * @class TAO_Condition @@ -106,6 +107,8 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Condition.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index 7e41b1cb2d0..0e69d8b1bf1 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -1,5 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// //$Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class MUTEX> ACE_INLINE int TAO_Condition<MUTEX>::wait (void) { @@ -47,3 +51,5 @@ TAO_Condition<MUTEX>::broadcast (void) { return this->cond_->broadcast (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp index 98764d36066..a60ae9b4d08 100644 --- a/TAO/tao/Connect_Strategy.cpp +++ b/TAO/tao/Connect_Strategy.cpp @@ -4,6 +4,8 @@ ACE_RCSID (tao, Connect_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) { @@ -13,3 +15,5 @@ TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) TAO_Connect_Strategy::~TAO_Connect_Strategy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h index be88ba7ff60..d80b23b5ff2 100644 --- a/TAO/tao/Connect_Strategy.h +++ b/TAO/tao/Connect_Strategy.h @@ -15,12 +15,16 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_Connector; class TAO_Connection_Handler; @@ -72,10 +76,13 @@ public: ACE_Time_Value *val) = 0; protected: + /// Cached copy of the ORB core pointer - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; + }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 838774ad068..42094e4ccf9 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -21,6 +21,8 @@ ACE_RCSID (tao, Connection_Handler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) , transport_ (0) @@ -421,3 +423,5 @@ TAO_Connection_Handler::close_handler (void) } //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 26312ebd79f..20138327665 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -1,4 +1,3 @@ - // -*- C++ -*- //============================================================================= @@ -16,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "LF_CH_Event.h" +#include "tao/LF_CH_Event.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,6 +23,8 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_Transport; class ACE_SOCK; @@ -174,7 +175,7 @@ protected: private: /// Pointer to the TAO_ORB_Core - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; /// Transport object reference TAO_Transport* transport_; @@ -194,6 +195,8 @@ private: //@@ CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Connection_Handler.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index 001bd2c811c..77ff81df46d 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -18,7 +18,7 @@ ACE_INLINE bool TAO_Connection_Handler::is_closed (void) const { return (this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED || - this->state_ == TAO_LF_Event::LFS_TIMEOUT); + this->state_ == TAO_LF_Event::LFS_TIMEOUT); } ACE_INLINE bool @@ -34,3 +34,5 @@ TAO_Connection_Handler::is_connecting (void) const } //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp index f903b1107e8..8bcf332a835 100644 --- a/TAO/tao/Connection_Purging_Strategy.cpp +++ b/TAO/tao/Connection_Purging_Strategy.cpp @@ -6,10 +6,12 @@ # include "tao/Connection_Purging_Strategy.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Connection_Purging_Strategy, +ACE_RCSID (tao, + Connection_Purging_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void) { } @@ -20,4 +22,4 @@ TAO_Connection_Purging_Strategy::cache_maximum (void) const return cache_maximum_; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h index eace4e9114c..c93038f7de3 100644 --- a/TAO/tao/Connection_Purging_Strategy.h +++ b/TAO/tao/Connection_Purging_Strategy.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // ================================================================ /** * @file Connection_Purging_Strategy.h @@ -13,12 +15,16 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Transport; // **************************************************************** @@ -52,6 +58,8 @@ private: int cache_maximum_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Connection_Purging_Strategy.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Connection_Purging_Strategy.inl b/TAO/tao/Connection_Purging_Strategy.inl index b0bc5b7b8f0..a361f536198 100644 --- a/TAO/tao/Connection_Purging_Strategy.inl +++ b/TAO/tao/Connection_Purging_Strategy.inl @@ -1,9 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Connection_Purging_Strategy::TAO_Connection_Purging_Strategy ( - int cache_maximum) - : cache_maximum_ (cache_maximum) + int cache_maximum) + : cache_maximum_ (cache_maximum) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp index ad333727bce..3e7c5742320 100644 --- a/TAO/tao/Connector_Impl.cpp +++ b/TAO/tao/Connector_Impl.cpp @@ -1,3 +1,5 @@ +// $Id$ + #ifndef TAO_CONNECTOR_IMPL_CPP #define TAO_CONNECTOR_IMPL_CPP @@ -7,7 +9,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID(tao, Connector_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class SVC_HANDLER> TAO_Connect_Creation_Strategy<SVC_HANDLER>:: @@ -58,5 +60,6 @@ TAO_Connect_Concurrency_Strategy<SVC_HANDLER>:: arg); } +TAO_END_VERSIONED_NAMESPACE_DECL -#endif /*TAO_CONNECTOR_IMPL_CPP*/ +#endif /* TAO_CONNECTOR_IMPL_CPP */ diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index 535d357c209..248be2daf3a 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -1,4 +1,5 @@ // -*- C++ -*- + // =================================================================== /** * @file Connector_Impl.h @@ -21,6 +22,8 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class ACE_Thread_Manager; @@ -54,10 +57,10 @@ public: private: /// Pointer to the ORB_Core on which we are activated - TAO_ORB_Core* orb_core_; + TAO_ORB_Core * const orb_core_; /// Are we using GIOP lite? - CORBA::Boolean lite_flag_; + CORBA::Boolean const lite_flag_; }; @@ -90,10 +93,13 @@ public: private: /// Pointer to the ORB Core. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Connector_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 7b7b956af7d..e71a35f173f 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -20,6 +20,7 @@ ACE_RCSID (tao, Connector_Registry, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connector_Registry::TAO_Connector_Registry (void) : connectors_ (0), @@ -266,3 +267,5 @@ TAO_Connector_Registry::object_key_delimiter (const char *ior) // against the provided string. return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 28bb89cd2a5..0fa4ed4ec4a 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -26,6 +26,8 @@ #include "tao/Basic_Types.h" #include "ace/Global_Macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class TAO_ORB_Core; class TAO_Connector; @@ -101,6 +103,8 @@ private: size_t size_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "tao/Connector_Registry.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Connector_Registry.i b/TAO/tao/Connector_Registry.i index c2976325560..e824efb5a6a 100644 --- a/TAO/tao/Connector_Registry.i +++ b/TAO/tao/Connector_Registry.i @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ConnectorSetIterator TAO_Connector_Registry::begin (void) { @@ -13,3 +15,5 @@ TAO_Connector_Registry::end (void) { return this->connectors_ + this->size_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index b8c4608aefc..ed69ac6de33 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -11,21 +11,19 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -#if !defined(__ACE_INLINE__) -#include "DLL_Parser.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID (tao, DLL_Parser, "$Id$") +static const char dll_prefix[] = "DLL:"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DLL_Parser::~TAO_DLL_Parser (void) { } -static const char dll_prefix[] = "DLL:"; int TAO_DLL_Parser::match_prefix (const char *ior_string) const @@ -63,6 +61,8 @@ TAO_DLL_Parser::parse_string (const char *ior, return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, ACE_TEXT ("DLL_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h index e509ee3ca29..926b52958c1 100644 --- a/TAO/tao/DLL_Parser.h +++ b/TAO/tao/DLL_Parser.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** @@ -22,6 +23,8 @@ #include "tao/IOR_Parser.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DLL_Parser * @@ -71,11 +74,9 @@ * loaded without any modifications to the application code. * */ -class TAO_Export TAO_DLL_Parser : public TAO_IOR_Parser +class TAO_DLL_Parser : public TAO_IOR_Parser { public: - /// Constructor - TAO_DLL_Parser (void); /// The destructor virtual ~TAO_DLL_Parser (void); @@ -89,9 +90,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined (__ACE_INLINE__) -# include "DLL_Parser.i" -#endif /* __ACE_INLINE__ */ +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_Parser) ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser) diff --git a/TAO/tao/DLL_Parser.i b/TAO/tao/DLL_Parser.i deleted file mode 100644 index 00a66f43394..00000000000 --- a/TAO/tao/DLL_Parser.i +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -ACE_INLINE -TAO_DLL_Parser::TAO_DLL_Parser (void) -{ -} diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp index 2b5ea0a0673..78ccc5c4b5c 100644 --- a/TAO/tao/Default_Collocation_Resolver.cpp +++ b/TAO/tao/Default_Collocation_Resolver.cpp @@ -9,6 +9,8 @@ ACE_RCSID (tao, #include "tao/Object.h" #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Boolean TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object ACE_ENV_ARG_DECL_NOT_USED) const @@ -16,6 +18,8 @@ TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object return object->_is_collocated (); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver, ACE_TEXT ("Default_Collocation_Resolver"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index 3d42c2a7d64..c98aefae6d5 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Default_Collocation_Resolver.h @@ -20,6 +22,8 @@ #include "tao/Collocation_Resolver.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Environment; @@ -43,6 +47,8 @@ public: ACE_ENV_ARG_DECL) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver) ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver) diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp index 8b0814e80e8..64fb8f94608 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "tao/Default_Endpoint_Selector_Factory.h" #include "tao/Invocation_Endpoint_Selectors.h" @@ -12,11 +11,12 @@ ACE_RCSID (tao, "$Id$") -TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (void) -{ - ACE_NEW (this->default_endpoint_selector_, - TAO_Default_Endpoint_Selector); +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory ( + void) + : default_endpoint_selector_ (new TAO_Default_Endpoint_Selector) +{ } TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void) @@ -32,6 +32,8 @@ TAO_Default_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT return this->default_endpoint_selector_; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Endpoint_Selector_Factory, diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h index 00558b91983..b521cab81dd 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ #include "tao/Endpoint_Selector_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward references class TAO_Default_Endpoint_Selector; @@ -62,12 +64,22 @@ public: virtual TAO_Invocation_Endpoint_Selector *get_selector ( ACE_ENV_SINGLE_ARG_DECL); +private: + + // Prevent copying/assignment. + TAO_Default_Endpoint_Selector_Factory (TAO_Default_Endpoint_Selector_Factory const &); + void operator= (TAO_Default_Endpoint_Selector_Factory const &); + protected: + /// The possible endpoint selector strategies that can be /// returned by this factory - TAO_Default_Endpoint_Selector *default_endpoint_selector_; + TAO_Default_Endpoint_Selector * const default_endpoint_selector_; + }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Endpoint_Selector_Factory) diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp index cc426e44165..4da1ad84a01 100644 --- a/TAO/tao/Default_Protocols_Hooks.cpp +++ b/TAO/tao/Default_Protocols_Hooks.cpp @@ -7,6 +7,7 @@ ACE_RCSID (tao, Default_Protocols_Hooks, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void) { @@ -168,6 +169,7 @@ TAO_Default_Protocols_Hooks::get_dscp_codepoint (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h index ad0d440d7df..540ed7b70fb 100644 --- a/TAO/tao/Default_Protocols_Hooks.h +++ b/TAO/tao/Default_Protocols_Hooks.h @@ -1,4 +1,3 @@ - // -*- C++ -*- // =================================================================== @@ -23,6 +22,8 @@ #include "tao/Protocols_Hooks.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_POA; class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks @@ -113,6 +114,8 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks) ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks) diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index d6603362980..9ce338efb56 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -12,6 +12,7 @@ ACE_RCSID (tao, TAO_Default_Stub_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void) { @@ -34,6 +35,8 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id, return retval; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h index f5b82a070ee..e0a4c60c5ec 100644 --- a/TAO/tao/Default_Stub_Factory.h +++ b/TAO/tao/Default_Stub_Factory.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Default_Stub_Factory.h @@ -25,6 +27,8 @@ #include "tao/Stub_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Default_Stub_Factory * @@ -39,7 +43,8 @@ class TAO_Export TAO_Default_Stub_Factory : public TAO_Stub_Factory { public: - // -- Ctor/Dtor -- + + /// Destructor. virtual ~TAO_Default_Stub_Factory (void); /// Creates a Stub Object. @@ -47,8 +52,11 @@ public: const TAO_MProfile &profiles, TAO_ORB_Core *orb_core ACE_ENV_ARG_DECL); + }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Stub_Factory) diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index 05268b9920e..d6c21e23ef2 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -12,13 +12,13 @@ ACE_RCSID (tao, Default_Thread_Lane_Resources_Manager, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : TAO_Thread_Lane_Resources_Manager (orb_core), - lane_resources_ (0) + lane_resources_ (new TAO_Thread_Lane_Resources (orb_core)) { - // Create the default resources. - ACE_NEW (this->lane_resources_, - TAO_Thread_Lane_Resources (orb_core)); } TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void) @@ -30,7 +30,7 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma int TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL) { - TAO_ORB_Parameters *params = + TAO_ORB_Parameters * const params = this->orb_core_->orb_params (); TAO_EndpointSet endpoint_set; @@ -86,6 +86,13 @@ TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mp return this->lane_resources_->is_collocated (mprofile); } +// ------------------------------------------------------- + +TAO_Default_Thread_Lane_Resources_Manager_Factory:: +~TAO_Default_Thread_Lane_Resources_Manager_Factory (void) +{ +} + TAO_Thread_Lane_Resources_Manager * TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core) { @@ -99,6 +106,11 @@ TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_ return manager; } +// ------------------------------------------------------- + +TAO_END_VERSIONED_NAMESPACE_DECL + + ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory, ACE_TEXT ("Default_Thread_Lane_Resources_Manager_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index 359158ff0cb..89f94829417 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Default_Thread_Lane_Resources_Manager.h @@ -20,16 +22,19 @@ #include "tao/Thread_Lane_Resources_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Default_Thread_Lane_Resources_Manager * * @brief Simple manager for thread lane resources. * + * \nosubgrouping * **/ -class TAO_Export TAO_Default_Thread_Lane_Resources_Manager : - public TAO_Thread_Lane_Resources_Manager +class TAO_Export TAO_Default_Thread_Lane_Resources_Manager + : public TAO_Thread_Lane_Resources_Manager { public: @@ -63,10 +68,16 @@ public: // @} +private: + + TAO_Default_Thread_Lane_Resources_Manager (TAO_Default_Thread_Lane_Resources_Manager const &); + void operator= (TAO_Default_Thread_Lane_Resources_Manager const &); + protected: /// Default lane resources. - TAO_Thread_Lane_Resources *lane_resources_; + TAO_Thread_Lane_Resources * const lane_resources_; + }; /** @@ -82,11 +93,16 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory { public: + /// Destructor. + virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory (void); + /// Factory method. TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index b51e0008ca8..7e4a4ab96aa 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "tao/Dynamic_Adapter.h" @@ -6,7 +6,10 @@ ACE_RCSID (tao, Dynamic_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index 970e28d5a54..af68465a486 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ #include "tao/Basic_Types.h" #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Object; @@ -108,6 +110,7 @@ public: ACE_ENV_ARG_DECL) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_H */ diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp index 319fc7d5d1a..75f61995341 100644 --- a/TAO/tao/Endpoint.cpp +++ b/TAO/tao/Endpoint.cpp @@ -6,13 +6,16 @@ #include "tao/Endpoint.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Endpoint, +ACE_RCSID (tao, + Endpoint, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Endpoint::~TAO_Endpoint (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL + //@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index b9ac5ef5a45..b762595ef58 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -27,6 +27,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* * Includes and forward decls for specializing TAO's * endpoint implementation. @@ -123,7 +125,7 @@ protected: /// IOP tag, identifying the protocol for which this endpoint /// contains addressing info. - CORBA::ULong tag_; + CORBA::ULong const tag_; /** * CORBA priority of the acceptor this Endpoint is representing. @@ -135,8 +137,8 @@ protected: private: /// Endpoints should not be copied. - ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&)) + TAO_Endpoint (const TAO_Endpoint&); + void operator= (const TAO_Endpoint&); /* * Addition of private members from derived class. @@ -147,6 +149,8 @@ private: //@@ TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Endpoint.i b/TAO/tao/Endpoint.i index 10d7d86325b..ab570490899 100644 --- a/TAO/tao/Endpoint.i +++ b/TAO/tao/Endpoint.i @@ -1,14 +1,17 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Endpoint::TAO_Endpoint (CORBA::ULong tag, CORBA::Short priority) : addr_lookup_lock_ () - // @@Would be a tragedy if the hash value of this endpoint is 0, in - // which case this optimizaton wouldn't work. We can get around - // that using a bool. But we don't want to increase the runtime - // memory + // @@ Would be a tragedy if the hash value of this endpoint is 0, in + // which case this optimizaton wouldn't work. We can get around + // that using a bool. But we don't want to increase the runtime + // memory. , hash_val_ (0) , tag_ (tag) , priority_ (priority) @@ -33,3 +36,5 @@ TAO_Endpoint::priority (CORBA::Short p) { this->priority_ = p; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp index 9e97eb8b282..6fc44b4efcc 100644 --- a/TAO/tao/Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Endpoint_Selector_Factory.cpp @@ -6,7 +6,10 @@ ACE_RCSID (tao, Endpoint_Selector_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h index 39540be51c4..c3364874813 100644 --- a/TAO/tao/Endpoint_Selector_Factory.h +++ b/TAO/tao/Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -18,15 +18,18 @@ #define TAO_ENDPOINT_SELECTOR_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" +#include "ace/CORBA_macros.h" -#include "tao/TAO_Export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -71,5 +74,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ENDPOINT_SELECTOR_FACTORY_H */ diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 77ad725837f..367d67fa99c 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -15,6 +15,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Environment::Environment (void) : exception_ (0) , previous_ (0) @@ -207,3 +209,4 @@ CORBA::Environment::print_exception (const char *info, ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info))); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 5446f342097..cfcde246122 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -32,6 +32,8 @@ #include "tao/Pseudo_VarOut_T.h" #include "tao/default_environment.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; namespace CORBA @@ -148,6 +150,8 @@ namespace CORBA }; } // End CORBA namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Environment.i" diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i index 3875aa4ac65..9a710cebffd 100644 --- a/TAO/tao/Environment.i +++ b/TAO/tao/Environment.i @@ -2,6 +2,9 @@ // // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::Environment_ptr env) @@ -42,3 +45,4 @@ CORBA::Environment::_nil (void) return static_cast <CORBA::Environment_ptr> (0); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 04fb03d6ca8..ecf9ac7d2dd 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -25,7 +25,6 @@ #include "ace/OS_NS_stdio.h" - ACE_RCSID (tao, Exception, "$Id$") @@ -33,6 +32,8 @@ ACE_RCSID (tao, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Exception::Exception (const char * repository_id, const char * local_name) : id_ (CORBA::string_dup (repository_id)), @@ -139,3 +140,4 @@ namespace CORBA #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */ +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 7414e2894f4..6482777f9ce 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -39,6 +39,8 @@ #include "ace/iosfwd.h" #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Allocator; class TAO_OutputCDR; @@ -231,6 +233,8 @@ public: static CORBA::SystemException *create_system_exception (const char *id); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Exception.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index 4eadae1c5a2..2a77bfab959 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Exception * CORBA::Exception::_downcast (CORBA::Exception * x) { @@ -13,3 +15,5 @@ CORBA::Exception::_downcast (CORBA::Exception const * x) { return x; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h index 49887b973ce..ff1794b49db 100644 --- a/TAO/tao/Exception_Data.h +++ b/TAO/tao/Exception_Data.h @@ -22,6 +22,8 @@ #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class TypeCode; @@ -60,5 +62,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_EXCEPTION_DATA_H*/ diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 46453d885d4..9780a4bdf66 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -9,6 +9,8 @@ ACE_RCSID (tao, Exclusive_TMS, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport), request_id_generator_ (0), @@ -126,3 +128,4 @@ TAO_Exclusive_TMS::connection_closed (void) this->rd_->connection_closed (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h index 6937340cb4c..84f659bcc68 100644 --- a/TAO/tao/Exclusive_TMS.h +++ b/TAO/tao/Exclusive_TMS.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Pluggable_Reply_Params; @@ -90,5 +91,7 @@ protected: // able to iterate on a use case - Bala. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* EXCLUSIVE_TMS_H */ diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 85110b780c4..4f944be4cf2 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -7,10 +7,6 @@ #include "ace/Read_Buffer.h" -#if !defined(__ACE_INLINE__) -#include "FILE_Parser.i" -#endif /* __ACE_INLINE__ */ - #include "ace/Malloc_Base.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" @@ -22,11 +18,14 @@ ACE_RCSID (tao, "$Id$") +static const char file_prefix[] = "file:"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FILE_Parser::~TAO_FILE_Parser (void) { } -static const char file_prefix[] = "file:"; int TAO_FILE_Parser::match_prefix (const char *ior_string) const @@ -79,6 +78,8 @@ TAO_FILE_Parser::parse_string (const char *ior, return object; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser, ACE_TEXT ("FILE_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 480fb653d18..70ef8805d96 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** @@ -22,6 +23,8 @@ #include "tao/IOR_Parser.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_FILE_Parser * @@ -32,11 +35,9 @@ * read its contents and then interepret the file as an IOR (that * can be in any valid format). */ -class TAO_Export TAO_FILE_Parser : public TAO_IOR_Parser +class TAO_FILE_Parser : public TAO_IOR_Parser { public: - /// Constructor - TAO_FILE_Parser (void); /// The destructor virtual ~TAO_FILE_Parser (void); @@ -50,9 +51,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined (__ACE_INLINE__) -# include "FILE_Parser.i" -#endif /* __ACE_INLINE__ */ +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_FILE_Parser) ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser) diff --git a/TAO/tao/FILE_Parser.i b/TAO/tao/FILE_Parser.i deleted file mode 100644 index c3ca97a6149..00000000000 --- a/TAO/tao/FILE_Parser.i +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -ACE_INLINE -TAO_FILE_Parser::TAO_FILE_Parser (void) -{ -} diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp index 847d5f00469..fedcae19465 100644 --- a/TAO/tao/Fault_Tolerance_Service.cpp +++ b/TAO/tao/Fault_Tolerance_Service.cpp @@ -13,6 +13,8 @@ ACE_RCSID (tao, Fault_Tolerance_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void) { delete this->ft_service_callback_; @@ -60,3 +62,5 @@ TAO_Fault_Tolerance_Service::retention_id (void) return ++this->ft_object_retention_id_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index ff8fd90b6a1..09c532a17b9 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -1,4 +1,5 @@ //-*- C++ -*- + //============================================================================= /** * @file Fault_Tolerance_Service.h @@ -17,14 +18,17 @@ #define TAO_FAULT_TOLERANCE_SERVICE_H #include /**/ "ace/pre.h" -#include "ace/SString.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" #include "tao/Basic_Types.h" +#include "ace/SString.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; class TAO_Service_Callbacks; @@ -93,6 +97,7 @@ private: // this. }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Fault_Tolerance_Service.i" diff --git a/TAO/tao/Fault_Tolerance_Service.i b/TAO/tao/Fault_Tolerance_Service.i index f7f4fefd7d3..6fb2c4ca1a1 100644 --- a/TAO/tao/Fault_Tolerance_Service.i +++ b/TAO/tao/Fault_Tolerance_Service.i @@ -1,4 +1,9 @@ +// -*- C++ -*- +// //$Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void) : ft_service_callback_ (0), @@ -8,8 +13,6 @@ TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void) { } - - ACE_INLINE TAO_Service_Callbacks * TAO_Fault_Tolerance_Service::service_callback (void) { @@ -28,3 +31,4 @@ TAO_Fault_Tolerance_Service::client_id (const char *id) this->ft_object_id_ = id; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 386cd9da395..762219e3b6f 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_C -#define TAO_FIXED_ARRAY_ARGUMENT_T_C +#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_CPP +#define TAO_FIXED_ARRAY_ARGUMENT_T_CPP #include "tao/Fixed_Array_Argument_T.h" @@ -9,9 +9,7 @@ #include "tao/Fixed_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Fixed_Array_Argument_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_slice, @@ -148,4 +146,6 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_CPP */ diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index 2ff2f43976b..81c351a3db1 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -179,6 +181,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Fixed_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index de891a44bcd..7465933cca4 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename S_slice, typename S_forany, @@ -132,3 +134,5 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::r { return this->x_._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp index 60a2fe74a63..871c13f7341 100644 --- a/TAO/tao/Fixed_Size_Argument_T.cpp +++ b/TAO/tao/Fixed_Size_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_FIXED_SIZE_ARGUMENT_T_C -#define TAO_FIXED_SIZE_ARGUMENT_T_C +#ifndef TAO_FIXED_SIZE_ARGUMENT_T_CPP +#define TAO_FIXED_SIZE_ARGUMENT_T_CPP #include "tao/Fixed_Size_Argument_T.h" @@ -9,9 +9,7 @@ #include "tao/Fixed_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Fixed_Size_Argument_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename Insert_Policy> @@ -108,4 +106,6 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -#endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_FIXED_SIZE_ARGUMENT_T_CPP */ diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index e4bc7c3aa3b..88bf0938df7 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -152,6 +154,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Fixed_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index bce99464476..bc747f119dc 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename Insert_Policy> ACE_INLINE @@ -93,3 +97,4 @@ TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void) return this->x_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource_Factory.cpp index b0529d29a0e..75ca24a18cd 100644 --- a/TAO/tao/FlResource_Factory.cpp +++ b/TAO/tao/FlResource_Factory.cpp @@ -8,11 +8,12 @@ ACE_RCSID( TAO_FlResource, FlResource_Factory, "$Id$"); +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { - - FlResource_Factory::FlResource_Factory (): - reactor_impl_( 0 ) + FlResource_Factory::FlResource_Factory (void) + : reactor_impl_( 0 ) { } @@ -34,3 +35,5 @@ namespace TAO return this->reactor_impl_; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource_Factory.h index ab34c6ef503..d4eddd7c36d 100644 --- a/TAO/tao/FlResource_Factory.h +++ b/TAO/tao/FlResource_Factory.h @@ -12,15 +12,20 @@ //============================================================================= #ifndef TAO_FLRESOURCE_FACTORY_H #define TAO_FLRESOURCE_FACTORY_H + #include /**/ "ace/pre.h" -#include "ace/FlReactor.h" + #include "tao/TAO_FlResource_Export.h" #include "tao/GUIResource_Factory.h" +#include "ace/FlReactor.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + + namespace TAO { /** @@ -51,5 +56,8 @@ namespace TAO ACE_FlReactor *reactor_impl_; }; } + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_FLRESOURCE_FACTORY_H */ diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource_Loader.cpp index 13f01c7bef4..e4014b038f0 100644 --- a/TAO/tao/FlResource_Loader.cpp +++ b/TAO/tao/FlResource_Loader.cpp @@ -7,10 +7,13 @@ ACE_RCSID( TAO_FlResource, FlResource_Loader, "$Id$"); +#include "ace/FlReactor.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { - - FlResource_Loader::FlResource_Loader () + FlResource_Loader::FlResource_Loader (void) { FlResource_Factory *tmp = 0; @@ -24,3 +27,5 @@ namespace TAO { } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h index c56c2c5a39f..a24762f699d 100644 --- a/TAO/tao/FlResource_Loader.h +++ b/TAO/tao/FlResource_Loader.h @@ -13,13 +13,17 @@ #ifndef TAO_FLRESOURCE_LOADER_H #define TAO_FLRESOURCE_LOADER_H + #include /**/ "ace/pre.h" + #include "tao/TAO_FlResource_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -41,10 +45,14 @@ namespace TAO { public: - FlResource_Loader ( ); + FlResource_Loader (void); - virtual ~FlResource_Loader (); + virtual ~FlResource_Loader (void); }; } + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_FLRESOURCE_LOADER_H */ diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp index 5d3e59a7e66..343515498b3 100644 --- a/TAO/tao/Flushing_Strategy.cpp +++ b/TAO/tao/Flushing_Strategy.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "Flushing_Strategy.h" @@ -7,6 +6,11 @@ ACE_RCSID (tao, Flushing_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h index 4c2cf07d43f..646a83b67b7 100644 --- a/TAO/tao/Flushing_Strategy.h +++ b/TAO/tao/Flushing_Strategy.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Time_Value; class TAO_Transport; class TAO_Queued_Message; @@ -67,6 +69,8 @@ public: virtual int flush_transport (TAO_Transport *transport) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index ff28b42cd9d..888b02eb037 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -22,22 +22,24 @@ ACE_RCSID (tao, GIOP_Message_Base, "$Id$") -TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, - size_t /*input_cdr_size*/) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core * orb_core, + size_t /* input_cdr_size */) : orb_core_ (orb_core) - , message_state_ () - , out_stream_ (this->buffer_, - sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */ - TAO_ENCAP_BYTE_ORDER, - orb_core->output_cdr_buffer_allocator (), - orb_core->output_cdr_dblock_allocator (), - orb_core->output_cdr_msgblock_allocator (), - orb_core->orb_params ()->cdr_memcpy_tradeoff (), - TAO_DEF_GIOP_MAJOR, - TAO_DEF_GIOP_MINOR) + , message_state_ () + , out_stream_ (this->buffer_, + sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */ + TAO_ENCAP_BYTE_ORDER, + orb_core->output_cdr_buffer_allocator (), + orb_core->output_cdr_dblock_allocator (), + orb_core->output_cdr_msgblock_allocator (), + orb_core->orb_params ()->cdr_memcpy_tradeoff (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR) { #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) - ACE_OS::memset(buffer_, 0, sizeof (buffer_)); + ACE_OS::memset (this->buffer_, 0, sizeof (buffer_)); #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ } @@ -830,11 +832,11 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, CORBA::Object_var forward_to; /* - * Hook to specialize request processing within TAO + * Hook to specialize request processing within TAO * This hook will be replaced by specialized request * processing implementation. */ -//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START +//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START // Do this before the reply is sent. this->orb_core_->request_dispatcher ()->dispatch ( @@ -1570,8 +1572,8 @@ TAO_GIOP_Message_Base::fragment_header_length (CORBA::Octet major, void TAO_GIOP_Message_Base::init_queued_data ( - TAO_Queued_Data* qd, - const TAO_GIOP_Message_State& state) const + TAO_Queued_Data* qd, + const TAO_GIOP_Message_State& state) const { qd->byte_order_ = state.byte_order_; qd->major_version_ = state.giop_version_.major; @@ -1580,3 +1582,5 @@ TAO_GIOP_Message_Base::init_queued_data ( qd->request_id_ = state.request_id_; qd->msg_type_ = this->message_type (state); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 853f4db9125..1c87e5c23e1 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// + // =================================================================== /** * @file GIOP_Message_Base.h @@ -28,6 +28,8 @@ #include "tao/GIOP_Message_State.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Pluggable_Reply_Params; class TAO_Queued_Data; @@ -264,5 +266,8 @@ protected: */ //@@ MESSAGING_SPL_EXTERN_ADD_HOOK +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" -#endif /*TAO_GIOP_MESSAGE_BASE_H*/ + +#endif /* TAO_GIOP_MESSAGE_BASE_H */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index c38aadd4626..63db40953b9 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -13,6 +13,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void) { } @@ -168,3 +170,5 @@ TAO_GIOP_Message_Generator_Parser::marshal_reply_status ( break; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index a427384ea93..0291c4264c3 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -1,5 +1,5 @@ - // -*- C++ -*- + // =================================================================== /** * @file GIOP_Message_Generator_Parser.h @@ -22,6 +22,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Details; class TAO_Target_Specification; class TAO_OutputCDR; @@ -109,5 +111,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index a78149c847a..fe1bd07d280 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -14,9 +14,11 @@ #include "ace/Log_Msg.h" ACE_RCSID (tao, - GIOP_Message_Gen_Parser_10, + GIOP_Message_Generator_Parser_10, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_GIOP_Message_Generator_Parser_10::write_request_header ( const TAO_Operation_Details &opdetails, @@ -467,7 +469,7 @@ CORBA::Octet TAO_GIOP_Message_Generator_Parser_10::major_version (void) { // Any harm in hardcoding?? - return (CORBA::Octet) 1; + return static_cast<CORBA::Octet> (1); } CORBA::Octet @@ -482,3 +484,5 @@ TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 848f83fffd2..6604c1ec09c 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -1,5 +1,5 @@ - // -*- C++ -*- + // =================================================================== /** * @file GIOP_Message_Generator_Parser_10.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_GIOP_Message_State; /** @@ -90,5 +92,8 @@ public: virtual size_t fragment_header_length (void) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp index 0d9bd94c60a..88bdbe641af 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp @@ -1,11 +1,15 @@ #include "tao/GIOP_Message_Generator_Parser_11.h" -ACE_RCSID (tao, - GIOP_Message_Gen_Parser_11, +ACE_RCSID (tao, + GIOP_Message_Generator_Parser_11, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Octet TAO_GIOP_Message_Generator_Parser_11::minor_version (void) { - return (CORBA::Octet) 1; + return static_cast<CORBA::Octet> (1); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index fd4232fe1b8..cc88a7082ec 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_GIOP_Message_Generator_Parser_11 * @@ -30,9 +32,8 @@ * the 1.0 class. * */ - -class TAO_Export TAO_GIOP_Message_Generator_Parser_11: - public TAO_GIOP_Message_Generator_Parser_10 +class TAO_Export TAO_GIOP_Message_Generator_Parser_11 + : public TAO_GIOP_Message_Generator_Parser_10 { public: @@ -41,5 +42,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" -#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H*/ + +#endif /* TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 5296e870b67..e7b735e2faa 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -21,6 +21,8 @@ ACE_RCSID (tao, // scope. static const size_t TAO_GIOP_MESSAGE_ALIGN_PTR = 8; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_GIOP_Message_Generator_Parser_12::write_request_header ( const TAO_Operation_Details &opdetails, @@ -566,3 +568,5 @@ TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const { return TAO_GIOP_MESSAGE_FRAGMENT_HEADER; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 5fa4d531ba9..1a91095fa6b 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -1,5 +1,5 @@ - // -*- C++ -*- + // =================================================================== /** * @file GIOP_Message_Generator_Parser_12.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_GIOP_Message_State; class TAO_Service_Context; class TAO_Transport; @@ -116,5 +118,8 @@ private: TAO_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" -#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H*/ + +#endif /* TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h index 9dd3e2cbf7c..9dad728f19b 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h @@ -1,5 +1,5 @@ - // -*- C++ -*- + // =================================================================== /** * @file GIOP_Message_Generator_Parser_Impl.h @@ -24,6 +24,8 @@ #include "tao/GIOP_Message_Generator_Parser_12.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_GIOP_Message_Generator_Parser_Impl * @@ -54,6 +56,9 @@ public: TAO_GIOP_Message_Generator_Parser_12 tao_giop_12; }; +TAO_END_VERSIONED_NAMESPACE_DECL + + #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Generator_Parser_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl index 49f47beff45..a144ae635f6 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl @@ -2,6 +2,8 @@ // //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_GIOP_Message_Generator_Parser_Impl::check_revision ( CORBA::Octet incoming_major, @@ -29,3 +31,5 @@ TAO_GIOP_Message_Generator_Parser_Impl::check_revision ( return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 25bed7f9928..242a22f7871 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// //$Id$ #include "GIOP_Message_Lite.h" @@ -24,6 +22,8 @@ static const size_t TAO_GIOP_LITE_HEADER_LEN = 5; static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0; static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core, size_t /*input_cdr_size*/) : orb_core_ (orb_core), @@ -1689,3 +1689,5 @@ TAO_GIOP_Message_Lite::init_queued_data (TAO_Queued_Data* qd) const qd->minor_version_ = TAO_DEF_GIOP_MINOR; qd->msg_type_ = this->message_type (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 8ddaa6ef89b..660a3bed0d5 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -27,6 +27,8 @@ #include "tao/SystemException.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Details; class TAO_Pluggable_Reply_Params; class TAO_GIOP_Locate_Request_Header; @@ -275,5 +277,7 @@ private: TAO_OutputCDR cdr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_GIOP_MESSAGE_LITE_H*/ diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp index 089da5d7a71..b4889f39b7c 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.cpp +++ b/TAO/tao/GIOP_Message_Locate_Header.cpp @@ -1,10 +1,11 @@ //$Id$ + #include "tao/GIOP_Message_Locate_Header.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Locate_Header.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Headers, +ACE_RCSID (tao, + GIOP_Message_Locate_Header, "$Id$") diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h index 89600c8ec1b..8604a1239a8 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.h +++ b/TAO/tao/GIOP_Message_Locate_Header.h @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_GIOP_Locate_Request_Header * @@ -70,6 +72,8 @@ private: TAO_InputCDR *incoming_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Locate_Header.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Locate_Header.i b/TAO/tao/GIOP_Message_Locate_Header.i index 8b8025c4603..d59598e5919 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.i +++ b/TAO/tao/GIOP_Message_Locate_Header.i @@ -1,9 +1,13 @@ // -*- C++ -*- +// //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE -TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg, - TAO_ORB_Core *orb) +TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header ( + TAO_InputCDR &msg, + TAO_ORB_Core *orb) : request_id_ (0), profile_ (orb), incoming_ (&msg) @@ -46,3 +50,4 @@ TAO_GIOP_Locate_Request_Header::incoming_stream (void) return *this->incoming_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index 6100e1fb4fe..130dc406166 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -14,6 +14,8 @@ ACE_RCSID (tao, GIOP_Message_State, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_GIOP_Message_State::TAO_GIOP_Message_State (void) : giop_version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), @@ -266,11 +268,13 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) // as SunCC) have a problem in deferencing from the // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be // on stack. So let us go ahead with this copying... - char buf [4]; - buf[0] = *rd_ptr; - buf[1] = *(rd_ptr + 1); - buf[2] = *(rd_ptr + 2); - buf[3] = *(rd_ptr + 3); + char buf[] = + { + *rd_ptr, + *(rd_ptr + 1), + *(rd_ptr + 2), + *(rd_ptr + 3) + }; #if !defined (ACE_DISABLE_SWAP_ON_READ) if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER)) @@ -287,3 +291,5 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) return x; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 16d9c11d14c..0bbe9d964dc 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -11,7 +11,7 @@ * * @author Chris Cleeland <cleeland@cs.wustl.edu> * @author Carlos O' Ryan <coryan@uci.edu> - * @author modified by Balachandran Natarajan <bala@cs.wustl.edu> + * @author Balachandran Natarajan <bala@cs.wustl.edu> */ //============================================================================= #ifndef TAO_GIOP_MESSAGE_STATE_H @@ -25,9 +25,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_GIOP_Message_Base; + /** * @class TAO_GIOP_Message_State * @@ -122,14 +126,15 @@ private: CORBA::ULong missing_data_; }; +TAO_END_VERSIONED_NAMESPACE_DECL -const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12; -const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8; -const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6; -const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET = 7; -const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5; -const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4; -const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4; +static const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12; +static const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8; +static const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6; +static const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET = 7; +static const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5; +static const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4; +static const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4; #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_State.inl" diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl index fe076bee689..9cf55f2c30f 100644 --- a/TAO/tao/GIOP_Message_State.inl +++ b/TAO/tao/GIOP_Message_State.inl @@ -2,6 +2,8 @@ //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::ULong TAO_GIOP_Message_State::message_size (void) const { @@ -52,3 +54,5 @@ TAO_GIOP_Message_State::header_received (void) const } #endif + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index 0c3f4dc9c55..f563af8004d 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -28,6 +28,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; /** @@ -52,9 +54,6 @@ public: TAO_GIOP_Message_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR, CORBA::Octet min = TAO_DEF_GIOP_MINOR); - /// Destructor. - ~TAO_GIOP_Message_Version (void); - /// Explicitly set the major and minor version. void set_version (CORBA::Octet maj, CORBA::Octet min); @@ -66,6 +65,8 @@ public: bool operator!= (const TAO_GIOP_Message_Version &src); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Version.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl index 216e29f5424..6328534b3fc 100644 --- a/TAO/tao/GIOP_Message_Version.inl +++ b/TAO/tao/GIOP_Message_Version.inl @@ -2,6 +2,8 @@ // //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_GIOP_Message_Version::TAO_GIOP_Message_Version ( const TAO_GIOP_Message_Version &src) @@ -18,20 +20,16 @@ TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj, { } -ACE_INLINE -TAO_GIOP_Message_Version::~TAO_GIOP_Message_Version (void) -{ -} - ACE_INLINE TAO_GIOP_Message_Version & TAO_GIOP_Message_Version::operator= ( const TAO_GIOP_Message_Version &src) { - if (this == &src) - return *this; + if (this != &src) + { + this->major = src.major; + this->minor = src.minor; + } - this->major = src.major; - this->minor = src.minor; return *this; } @@ -57,3 +55,5 @@ TAO_GIOP_Message_Version::operator!= ( { return !(*this == src); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp index 37708188381..595a6f85936 100644 --- a/TAO/tao/GIOP_Utils.cpp +++ b/TAO/tao/GIOP_Utils.cpp @@ -9,12 +9,13 @@ ACE_RCSID (tao, GIOP_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int -TAO_GIOP_Utils:: - read_bytes_input (TAO_Transport *transport, - TAO_InputCDR &input, - CORBA::ULong read_size, - ACE_Time_Value *value) +TAO_GIOP_Utils::read_bytes_input (TAO_Transport *transport, + TAO_InputCDR &input, + CORBA::ULong read_size, + ACE_Time_Value *value) { // Grow the size of CDR stream if (input.grow (read_size) == -1) @@ -76,3 +77,5 @@ TAO_GIOP_Utils::read_buffer (TAO_Transport *transport, return bytes_read; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h index b3d3ff167b3..4a6e0bcdace 100644 --- a/TAO/tao/GIOP_Utils.h +++ b/TAO/tao/GIOP_Utils.h @@ -27,6 +27,8 @@ #include "tao/IOP_IORC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Transport; class ACE_Time_Value; @@ -144,5 +146,7 @@ public: ACE_Time_Value *max_wait_time = 0); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_GIOP_UTILS_H */ diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp index ae586a57a99..a94f2e97302 100644 --- a/TAO/tao/GUIResource_Factory.cpp +++ b/TAO/tao/GUIResource_Factory.cpp @@ -3,14 +3,16 @@ #include "ace/Reactor.h" #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { - GUIResource_Factory::GUIResource_Factory (): - dynamically_allocated_reactor_ (0) + GUIResource_Factory::GUIResource_Factory (void) + : dynamically_allocated_reactor_ (0) { } - GUIResource_Factory::~GUIResource_Factory () + GUIResource_Factory::~GUIResource_Factory (void) { } @@ -53,3 +55,5 @@ namespace TAO delete reactor; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index 0d85ab6b2d1..116e4a76293 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //forwards class ACE_Reactor_Impl; class ACE_Reactor; @@ -86,5 +88,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_GUI_RESOURCE_FACTORY_H*/ diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp index 5155f7b0b56..77fcadefc4c 100644 --- a/TAO/tao/IFR_Client_Adapter.cpp +++ b/TAO/tao/IFR_Client_Adapter.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "tao/IFR_Client_Adapter.h" diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index 1d3240b853e..6bd15379c82 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -27,6 +27,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_OutputCDR; namespace CORBA @@ -96,5 +98,7 @@ public: #endif /*TAO_HAS_MINIMUM_CORBA*/ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IFR_CLIENT_ADAPTER_H */ diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index fd529fbee5f..be71fe1c7fb 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -25,6 +25,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (IOP::TAG_INTERNET_IOP), addrs_ (0), @@ -554,8 +556,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->creation_strategy_, this->accept_strategy_, this->concurrency_strategy_, - 0, 0, 0, 1, - this->reuse_addr_) == -1) + 0, 0, 0, 1, + this->reuse_addr_) == -1) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -590,8 +592,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->creation_strategy_, this->accept_strategy_, this->concurrency_strategy_, - 0, 0, 0, 1, - this->reuse_addr_) != -1) + 0, 0, 0, 1, + this->reuse_addr_) != -1) { found_a_port = true; break; @@ -1164,9 +1166,9 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, this->hostname_in_ior_ = value.rep (); } else if (name == "reuse_addr") - { - this->reuse_addr_ = ACE_OS::atoi (value.c_str ()); - } + { + this->reuse_addr_ = ACE_OS::atoi (value.c_str ()); + } else { // the name is not known, skip to the next option @@ -1186,4 +1188,6 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 8a43ea3cc82..6e22286cc95 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -32,6 +32,8 @@ #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_IIOP_Acceptor * @@ -251,6 +253,8 @@ private: //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "tao/IIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i index 9aed23e08d2..baeaba0a476 100644 --- a/TAO/tao/IIOP_Acceptor.i +++ b/TAO/tao/IIOP_Acceptor.i @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const ACE_INET_Addr& TAO_IIOP_Acceptor::address (void) const { @@ -33,3 +36,5 @@ TAO_IIOP_Acceptor::set_default_address (const ACE_INET_Addr& addr) { this->default_address_.set (addr); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index e7c12e1e589..a263a71dc2a 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -16,6 +16,8 @@ ACE_RCSID (tao, IIOP_Connection_Handler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -404,7 +406,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio CORBA::Long codepoint = tph->get_dscp_codepoint (); - tos = (int)(codepoint) << 2; + tos = static_cast<int> (codepoint) << 2; } if (tos != this->dscp_codepoint_) @@ -462,3 +464,5 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio /* * End copy hook */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index 5654472ea3e..bbcceb032dc 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- // =================================================================== /** @@ -7,7 +7,7 @@ * $Id$ * * @author Originally by Chris Cleeland as IIOP_Connect.h - * @author modified by Balachandran Natarajan <bala@cs.wustl.edu> + * @author Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== @@ -27,6 +27,8 @@ #include "tao/Connection_Handler.h" #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> TAO_IIOP_SVC_HANDLER; @@ -129,5 +131,7 @@ private: int dscp_codepoint_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IIOP_CONNECTION_HANDLER_H */ diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index aaec2f32252..27bbe5026ff 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -18,6 +18,8 @@ ACE_RCSID (tao, IIOP_Connector, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IIOP_Connector::~TAO_IIOP_Connector (void) { } @@ -396,3 +398,5 @@ TAO_IIOP_Connector::cancel_svc_handler ( return -1; } //@@ TAO_CONNECTOR_SPL_COPY_HOOK_END + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index cb57818fa1b..ce75430c44f 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,14 +25,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Connector.h" - #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" #include "tao/IIOP_Connection_Handler.h" -class TAO_IIOP_Endpoint; +#include "ace/Connector.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_IIOP_Endpoint; // **************************************************************** @@ -129,6 +130,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_IIOP_CONNECTOR_H */ diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index bec2bb60242..28cdaa075e9 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -32,6 +32,8 @@ ACE_RCSID (tao, //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) @@ -512,3 +514,5 @@ TAO_IIOP_Endpoint::preferred_network (void) const } //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 0ce97db063b..4c8c1bfd218 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -16,16 +16,20 @@ #define TAO_IIOP_ENDPOINT_H #include /**/ "ace/pre.h" -#include "ace/INET_Addr.h" + +#include "tao/Endpoint.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Endpoint.h" #include "tao/CORBA_String.h" #include "tao/IIOP_EndpointsC.h" +#include "ace/INET_Addr.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IIOP_Connection_Handler; /** @@ -188,6 +192,7 @@ private: //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/IIOP_Endpoint.i" diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i index fa83957822d..e576613fdcd 100644 --- a/TAO/tao/IIOP_Endpoint.i +++ b/TAO/tao/IIOP_Endpoint.i @@ -2,7 +2,7 @@ // // $Id$ - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * TAO_IIOP_Endpoint::host (void) const @@ -29,3 +29,5 @@ TAO_IIOP_Endpoint::is_ipv6_decimal (void) const return this->is_ipv6_decimal_; } #endif /* ACE_HAS_IPV6 */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 852fde2c935..8f2baeba879 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -11,7 +11,9 @@ ACE_RCSID (tao, "$Id$") -static const char prefix_[] = "iiop"; +static const char the_prefix[] = "iiop"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void) : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), @@ -28,13 +30,13 @@ int TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); } const char * TAO_IIOP_Protocol_Factory::prefix (void) const { - return ::prefix_; + return ::the_prefix; } char @@ -79,6 +81,8 @@ TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory, ACE_TEXT ("IIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index 66bd50adfab..d7302fd08c3 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -23,6 +23,8 @@ #include "tao/Protocol_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Acceptor; class TAO_Connector; @@ -54,10 +56,12 @@ public: private: /// Changing the version number can be used to provide backwards /// compatibility with old clients. - int major_; - int minor_; + int const major_; + int const minor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory) diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp index 0790993aeeb..ba17a7c0c51 100644 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ b/TAO/tao/IIOP_Lite_Factory.cpp @@ -11,7 +11,7 @@ ACE_RCSID (tao, "$Id$") -static const char prefix_[] = "iiop"; +static const char the_prefix[] = "iiop"; TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), @@ -29,13 +29,13 @@ int TAO_IIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); } const char * TAO_IIOP_Lite_Protocol_Factory::prefix (void) const { - return ::prefix_; + return ::the_prefix; } char @@ -85,6 +85,8 @@ TAO_IIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory, ACE_TEXT ("IIOP_Lite_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h index fe4e1026abe..c1f7cc876dd 100644 --- a/TAO/tao/IIOP_Lite_Factory.h +++ b/TAO/tao/IIOP_Lite_Factory.h @@ -23,6 +23,8 @@ #include "tao/Protocol_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Acceptor; class TAO_Connector; @@ -56,10 +58,12 @@ public: private: /// Changing the version number can be used to provide backwards /// compatibility with old clients. - int major_; - int minor_; + int const major_; + int const minor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory) diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index d1474d2499b..0f07764ff5a 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -15,6 +15,10 @@ ACE_RCSID (tao, #include "ace/os_include/os_netdb.h" +static const char the_prefix[] = "iiop"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IIOP_Profile::~TAO_IIOP_Profile (void) { // Clean up the list of endpoints since we own it. @@ -32,8 +36,6 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void) //@@ TAO_PROFILE_SPL_COPY_HOOK_START -static const char prefix_[] = "iiop"; - const char TAO_IIOP_Profile::object_key_delimiter_ = '/'; char @@ -376,7 +378,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) size_t buflen = (8 /* "corbaloc" */ + 1 /* colon separator */ + - ACE_OS::strlen (::prefix_) + + ACE_OS::strlen (::the_prefix) + 1 /* colon separator */ + 1 /* major version */ + 1 /* decimal point */ + @@ -409,7 +411,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@[%s]:%d%c%s", - ::prefix_, + ::the_prefix, digits [this->version_.major], digits [this->version_.minor], tmp.c_str (), @@ -421,7 +423,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) #endif /* ACE_HAS_IPV6 */ ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@%s:%d%c%s", - ::prefix_, + ::the_prefix, digits [this->version_.major], digits [this->version_.minor], this->endpoint_.host (), @@ -435,7 +437,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_IIOP_Profile::prefix (void) { - return ::prefix_; + return ::the_prefix; } void @@ -527,7 +529,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void) else #endif /* ACE_HAS_IPV6 */ if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0) - || (out_cdr << endpoint->host () == 0) + || (out_cdr << endpoint->host () == 0) || (out_cdr << endpoint->port () == 0)) return -1; @@ -541,7 +543,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void) tagged_component.component_data.get_buffer (); for (const ACE_Message_Block *iterator = out_cdr.begin (); - iterator != 0; + iterator != 0; iterator = iterator->cont ()) { size_t i_length = iterator->length (); @@ -723,3 +725,5 @@ TAO_IIOP_Profile::decode_endpoints (void) return 0; } //@@ TAO_PROFILE_SPL_COPY_HOOK_END + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index b48f9e96063..a7d52bbc467 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -1,5 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- - +// -*- C++ -*- //============================================================================= /** @@ -7,8 +6,7 @@ * * $Id$ * - * IIOP profile specific processing - * + * IIOP profile specific processing. * * @author Fred Kuhns <fredk@cs.wustl.edu> */ @@ -28,6 +26,8 @@ #include "tao/IIOP_Endpoint.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO IIOP_Profile concrete Profile definitions /** * @class TAO_IIOP_Profile @@ -169,5 +169,8 @@ protected: //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_IIOP_PROFILE_H */ diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 7eb3da409a5..364007ba52b 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -15,6 +15,8 @@ ACE_RCSID (tao, IIOP_Transport, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean ) @@ -421,3 +423,5 @@ TAO_IIOP_Transport::get_listen_point ( /* * End of copy hook. */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 5bbebdd5ae9..2e094054834 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace IIOP { class ListenPointList; @@ -145,6 +147,8 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IIOP_TRANSPORT_H */ diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp index 87e2ca2971c..7759e6793f3 100644 --- a/TAO/tao/IORInterceptor_Adapter.cpp +++ b/TAO/tao/IORInterceptor_Adapter.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "tao/IORInterceptor_Adapter.h" @@ -6,7 +6,10 @@ ACE_RCSID (tao, IORInterceptor_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index c37d8a3a940..f976305aaf3 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "ace/Array_Base.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,6 +25,10 @@ #include "tao/SystemException.h" #include "tao/PI_ForwardC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +template <class T> class ACE_Array_Base; + namespace PortableInterceptor { class IORInterceptor; @@ -95,5 +99,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IORINTERCEPTOR_ADAPTER_H */ diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp index 4bf66592ee5..083299eeb96 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp @@ -5,6 +5,10 @@ ACE_RCSID (tao, IORInterceptor_Adapter_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index e56e7994296..ebb5561ee76 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IORInterceptor_Adapter; /** @@ -46,6 +48,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp index 8852c907d52..abc812d7f58 100644 --- a/TAO/tao/IOR_Parser.cpp +++ b/TAO/tao/IOR_Parser.cpp @@ -4,7 +4,11 @@ ACE_RCSID(tao, IOR_Parser, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IOR_Parser::~TAO_IOR_Parser (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index dc82f1c9cca..0058a743a0e 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** @@ -22,6 +23,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Object; @@ -62,5 +65,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IOR_PARSER_H */ diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 61999fb1a11..e294b0d3bac 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -14,6 +14,8 @@ ACE_RCSID (tao, Incoming_Message_Queue, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core) : last_added_ (0), size_ (0), @@ -424,3 +426,4 @@ TAO_Queued_Data::consolidate (void) } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index c5ca740eb13..14f498e4a70 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations class ACE_Allocator; class TAO_ORB_Core; @@ -237,6 +239,7 @@ private: ACE_Allocator *allocator_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "Incoming_Message_Queue.inl" diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl index 99bcb4978d3..fe337d80687 100644 --- a/TAO/tao/Incoming_Message_Queue.inl +++ b/TAO/tao/Incoming_Message_Queue.inl @@ -1,6 +1,9 @@ // -*- C++ -*- +// //$Id$ -// -*- C++ -*- + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /************************************************************************/ // Methods for TAO_Incoming_Message_Queue /************************************************************************/ @@ -90,3 +93,5 @@ TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb) // Remove the DONT_DELETE flags from mb mb.clr_self_flags (ACE_Message_Block::DONT_DELETE); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp index e7776d3fd91..482b9545346 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_C -#define TAO_INTRUSIVE_REF_COUNT_BASE_T_C +#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP +#define TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP #include "Intrusive_Ref_Count_Base_T.h" @@ -9,13 +9,13 @@ #include "tao/Intrusive_Ref_Count_Base_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Intrusive_Ref_Count_Base_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> TAO_Intrusive_Ref_Count_Base<T>::~TAO_Intrusive_Ref_Count_Base() { } -#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP */ diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index f37041bd02c..e0df6c0c5d2 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -19,8 +19,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Atomic_Op.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Intrusive_Ref_Count_Base<ACE_LOCK> @@ -38,26 +41,28 @@ class TAO_Intrusive_Ref_Count_Base { public: - virtual ~TAO_Intrusive_Ref_Count_Base(); + virtual ~TAO_Intrusive_Ref_Count_Base (void); - void _add_ref(); - void _remove_ref(); + void _add_ref (void); + void _remove_ref (void); protected: - TAO_Intrusive_Ref_Count_Base(); + TAO_Intrusive_Ref_Count_Base (void); private: ACE_Atomic_Op<ACE_LOCK, long> ref_count_; - // Not implemented. - TAO_Intrusive_Ref_Count_Base(const TAO_Intrusive_Ref_Count_Base&); - TAO_Intrusive_Ref_Count_Base& operator=(const TAO_Intrusive_Ref_Count_Base&); + // Prevent copying/assignment. + TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&); + TAO_Intrusive_Ref_Count_Base& operator= (const TAO_Intrusive_Ref_Count_Base&); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Intrusive_Ref_Count_Base_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl index 448763b6c74..26e5026c413 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.inl @@ -1,8 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base () +TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) : ref_count_(1) {} @@ -10,7 +14,7 @@ TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base () template <typename T> ACE_INLINE void -TAO_Intrusive_Ref_Count_Base<T>::_add_ref() +TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) { ++this->ref_count_; } @@ -19,9 +23,9 @@ TAO_Intrusive_Ref_Count_Base<T>::_add_ref() template <typename T> ACE_INLINE void -TAO_Intrusive_Ref_Count_Base<T>::_remove_ref() +TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void) { - long new_count = --this->ref_count_; + long const new_count = --this->ref_count_; if (new_count != 0) { @@ -30,3 +34,5 @@ TAO_Intrusive_Ref_Count_Base<T>::_remove_ref() delete this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp index f66b1177c48..3acff130173 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_C -#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_C +#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP +#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP #include "Intrusive_Ref_Count_Handle_T.h" @@ -9,8 +9,4 @@ #include "tao/Intrusive_Ref_Count_Handle_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Intrusive_Ref_Count_Handle_T, - "$Id$") - -#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_C */ +#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP */ diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index ce9a64dc694..fab5c62cb0e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -15,10 +15,15 @@ #include /**/ "ace/pre.h" +#include "ace/config-all.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Intrusive_Ref_Count_Handle<T> @@ -29,23 +34,23 @@ * difference is that this class provides a "bool is_nil() const" method, * and xxx_var types don't (they use the "bool CORBA::is_nil(xxx_ptr ptr)" * method instead). For example, - * - * typedef TAO_Intrusive_Ref_Count_Handle<PortableServer::ServantBase> + * + * typedef TAO_Intrusive_Ref_Count_Handle<PortableServer::ServantBase> * MyServantBase_var; - * - * The MyServantBase_var and the PortableServer::ServantBase_var are - * nearly idenitical. The only difference is that the MyServantBase_var + * + * The MyServantBase_var and the PortableServer::ServantBase_var are + * nearly idenitical. The only difference is that the MyServantBase_var * has a "isNil()" method that indicates whether or not the smart pointer - * is in the 'nil' state or not. + * is in the 'nil' state or not. * - * This class can be used to "safely" deal with an instance of a servant. - * For example, we can use a single variable + * This class can be used to "safely" deal with an instance of a servant. + * For example, we can use a single variable * TAO_Intrusive_Ref_Count_Handle<Foo_i> * * typedef TAO_Intrusive_Ref_Count_Handle<Foo_i> Foo_i_var; * Foo_i_var servant_; * - * instead of using two variables + * instead of using two variables * * PortableServer::ServantBase_var servant_holder_; * Foo_i* servant_; @@ -54,15 +59,15 @@ * * The Foo_i_var type does everything that the PortableServer::ServantBase_var * type does. In addition, the Foo_i_var type can provide access to the servant - * as derived class via the arrow operator. + * as derived class via the arrow operator. */ template <typename T> class TAO_Intrusive_Ref_Count_Handle { public: - /// Default Ctor - enters the "nil" state. - TAO_Intrusive_Ref_Count_Handle(); + /// Default Constructor - enters the "nil" state. + TAO_Intrusive_Ref_Count_Handle (void); /// Ctor - By default, takes ownership of passed-in "copy" of reference /// to T. But the second argument (bool) can be changed from @@ -74,17 +79,17 @@ public: /// ownership (false value for second arg), then the reference /// counter of the T object will be incremented so that this /// handle object has its own "copy". - TAO_Intrusive_Ref_Count_Handle(T* p, bool take_ownership = true); + TAO_Intrusive_Ref_Count_Handle (T* p, bool take_ownership = true); - /// Copy Ctor - claims a "copy" of rhs object's reference to T. - TAO_Intrusive_Ref_Count_Handle(const TAO_Intrusive_Ref_Count_Handle& b); + /// Copy Constructor - claims a "copy" of rhs object's reference to T. + TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b); - /// Dtor - ~TAO_Intrusive_Ref_Count_Handle(); + /// Destructor + ~TAO_Intrusive_Ref_Count_Handle (void); /// Assignment Operator with T* argument. /// Takes ownership of passed-in "copy" of reference to T. - TAO_Intrusive_Ref_Count_Handle& operator=(T* p); + TAO_Intrusive_Ref_Count_Handle& operator= (T* p); /// Assignment Operator with const TAO_Smart_Ptr<T>& argument. /// Claims a "copy" of rhs object's reference to T. @@ -96,21 +101,21 @@ public: /// Returns true if underlying pointer is NULL (0). /// Returns false otherwise. - bool is_nil() const; + bool is_nil (void) const; /// Used to pass the underlying pointer as an "IN" argument to a method. - T* in() const; + T* in (void) const; /// Used to pass the underlying pointer as an "IN/OUT" argument to a method. - T*& inout(); + T*& inout (void); /// Used to pass the underlying pointer as an "OUT" argument to a method. - T*& out(); + T*& out (void); /// Used to take-away the underlying pointer from this smart pointer object. /// Caller becomes responsibe for the returned "copy" to the reference. /// Always leaves the smart pointer in the "nil" state upon return. - T* _retn(); + T* _retn (void); private: @@ -118,14 +123,14 @@ private: /// Claim a "copy" of the reference-counted object by adding /// one to its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. - void claim(); + void claim (void); /// Drop our "copy" of the reference-counted object by removing /// one from its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. /// Note that this method will always leave this smart pointer /// in the "nil" state upon its return. - void drop(); + void drop (void); /// The underlying pointer to the (intrusively) reference-counted object. @@ -135,6 +140,8 @@ private: T* ptr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Intrusive_Ref_Count_Handle_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl index 9c3a1fbe48b..fca4936b4bf 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl @@ -1,9 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle() +TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (void) : ptr_(0) { } @@ -11,22 +14,22 @@ TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle() template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle - (T* p, - bool take_ownership) +TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle ( + T* p, + bool take_ownership) : ptr_(p) { if (!take_ownership) { - this->claim(); + this->claim (); } } template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle - (const TAO_Intrusive_Ref_Count_Handle<T>& b) +TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle ( + const TAO_Intrusive_Ref_Count_Handle<T>& b) : ptr_(b.ptr_) { this->claim(); @@ -62,12 +65,14 @@ TAO_Intrusive_Ref_Count_Handle<T>& TAO_Intrusive_Ref_Count_Handle<T>::operator= (const TAO_Intrusive_Ref_Count_Handle<T>& b) { - if (this->ptr_ != b.ptr_) - { - this->drop(); - this->ptr_ = b.ptr_; - this->claim(); - } + // Strongly exception-safe assignment through the usual copy and + // swap technique. + + TAO_Intrusive_Ref_Count_Handle<T> tmp (b); + + T * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_tmp; return *this; } @@ -153,3 +158,5 @@ TAO_Intrusive_Ref_Count_Handle<T>::drop() this->ptr_ = 0; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 98ec2a02f51..893cfc9992e 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -21,6 +21,8 @@ ACE_RCSID (tao, Invocation_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Invocation_Adapter::~Invocation_Adapter (void) @@ -393,3 +395,5 @@ namespace TAO return; } } // End namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 66e3f223499..70793b31da7 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -29,6 +29,8 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Details; class TAO_Stub; class ACE_Time_Value; @@ -278,6 +280,7 @@ namespace TAO }; } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Invocation_Adapter.inl" diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl index b27c3070466..3ee1410310c 100644 --- a/TAO/tao/Invocation_Adapter.inl +++ b/TAO/tao/Invocation_Adapter.inl @@ -1,5 +1,9 @@ // -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ACE_INLINE @@ -12,7 +16,6 @@ namespace TAO Collocation_Proxy_Broker *p, Invocation_Type type, Invocation_Mode mode) - : target_ (target) , args_ (args) , number_args_ (arg_number) @@ -24,3 +27,5 @@ namespace TAO { } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index 61f210e8d08..f3e715f88e4 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -22,6 +22,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Invocation_Base::Invocation_Base (CORBA::Object_ptr ot, @@ -269,3 +271,5 @@ namespace TAO } #endif /*TAO_HAS_INTERCEPTORS == 1*/ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index fafe93b6d1e..75370bf25bb 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -29,6 +29,8 @@ #include "tao/ClientRequestInterceptor_Adapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Service_Context; class TAO_Operation_Details; class TAO_Stub; @@ -228,6 +230,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Invocation_Base.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl index fcdf1d95f41..30e4c6c16d3 100644 --- a/TAO/tao/Invocation_Base.inl +++ b/TAO/tao/Invocation_Base.inl @@ -1,5 +1,9 @@ // -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ACE_INLINE TAO_ORB_Core * @@ -80,7 +84,7 @@ namespace TAO { return this->invoke_status_; } -#endif /*TAO_HAS_INTERCEPTORS*/ - - +#endif /* TAO_HAS_INTERCEPTORS */ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index f77b369c63a..353b0497203 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- //$Id$ #include "tao/Invocation_Endpoint_Selectors.h" #include "tao/Stub.h" @@ -14,9 +13,8 @@ ACE_RCSID (tao, Invocation_Endpoint_Selectors, "$Id$") -TAO_Invocation_Endpoint_Selector::TAO_Invocation_Endpoint_Selector (void) -{ -} + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void) { @@ -24,10 +22,6 @@ TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void) // **************************************************************** -TAO_Default_Endpoint_Selector::TAO_Default_Endpoint_Selector (void) -{ -} - TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void) { } @@ -166,3 +160,5 @@ TAO_Default_Endpoint_Selector::select_endpoint ( ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index 776d6bc8411..4778f792a23 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -17,13 +17,19 @@ #define TAO_INVOCATION_ENDPOINT_SELECTOR_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" +#include "tao/Versioned_Namespace.h" + +#include "ace/CORBA_macros.h" + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_MProfile; class ACE_Time_Value; @@ -55,8 +61,6 @@ namespace CORBA class TAO_Export TAO_Invocation_Endpoint_Selector { public: - /// Constructor. - TAO_Invocation_Endpoint_Selector (void); /// Destructor. virtual ~TAO_Invocation_Endpoint_Selector (void); @@ -82,12 +86,10 @@ public: * profile in the IOR. If that doesn't work, try the next * profile, and so on. */ -class TAO_Export TAO_Default_Endpoint_Selector : - public TAO_Invocation_Endpoint_Selector +class TAO_Export TAO_Default_Endpoint_Selector + : public TAO_Invocation_Endpoint_Selector { public: - /// Constructor. - TAO_Default_Endpoint_Selector (void); /// Destructor. virtual ~TAO_Default_Endpoint_Selector (void); @@ -97,5 +99,8 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_INVOCATION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h index 083f69cc0b1..9b8804ea690 100644 --- a/TAO/tao/Invocation_Utils.h +++ b/TAO/tao/Invocation_Utils.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { enum Invocation_Status @@ -67,5 +71,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_INVOCATION_UTILS_H */ diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index 492ed96e02a..267ea7f2b68 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -4,6 +4,8 @@ ACE_RCSID(tao, LF_Invocation_Event, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_CH_Event::TAO_LF_CH_Event (void) : TAO_LF_Event (), prev_state_ (TAO_LF_Event::LFS_IDLE) @@ -94,9 +96,10 @@ TAO_LF_CH_Event::set_state (int new_state) } } - int TAO_LF_CH_Event::is_state_final (void) { return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h index af303857916..7e1c49deeae 100644 --- a/TAO/tao/LF_CH_Event.h +++ b/TAO/tao/LF_CH_Event.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LF_CH_Event * @@ -105,6 +107,8 @@ private: int prev_state_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LF_CH_EVENT_H */ diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index 68873f5fe66..f478faba32c 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -10,6 +10,9 @@ ACE_RCSID(tao, LF_Connect_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy ( TAO_ORB_Core *orb_core) : TAO_Connect_Strategy (orb_core) @@ -74,3 +77,5 @@ TAO_LF_Connect_Strategy::wait (TAO_Transport *transport, return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h index 5ca99679939..75c1ef7f605 100644 --- a/TAO/tao/LF_Connect_Strategy.h +++ b/TAO/tao/LF_Connect_Strategy.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Connector; class ACE_Time_Value; class ACE_Synch_Options; @@ -57,6 +59,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_LF_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp index d3c5673b368..933a1c8fd95 100644 --- a/TAO/tao/LF_Event.cpp +++ b/TAO/tao/LF_Event.cpp @@ -1,5 +1,5 @@ -// -*- C++ -*- // $Id$ + #include "LF_Event.h" #include "LF_Follower.h" #include "Leader_Follower.h" @@ -13,6 +13,8 @@ ACE_RCSID (tao, LF_Event, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Event::TAO_LF_Event (void) : state_ (TAO_LF_Event::LFS_IDLE) , follower_ (0) @@ -39,9 +41,10 @@ TAO_LF_Event::state_changed (int new_state, } } - void TAO_LF_Event::set_state (int new_state) { this->state_ = new_state; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 0a721b4cad4..63d2ff59d38 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -15,12 +15,16 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LF_Follower; class TAO_Leader_Follower; @@ -139,6 +143,8 @@ protected: TAO_LF_Follower *follower_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "LF_Event.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl index d6509c68430..236c8ea69ac 100644 --- a/TAO/tao/LF_Event.inl +++ b/TAO/tao/LF_Event.inl @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int TAO_LF_Event::bind (TAO_LF_Follower *follower) { @@ -30,3 +33,5 @@ TAO_LF_Event::keep_waiting (void) { return (this->successful () == 0) && (this->error_detected () == 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp index a9fdf03c2ad..27fc93c2c5e 100644 --- a/TAO/tao/LF_Event_Binder.cpp +++ b/TAO/tao/LF_Event_Binder.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Event_Binder.h" @@ -7,11 +6,15 @@ # include "tao/LF_Event_Binder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event_Binder, +ACE_RCSID (tao, + LF_Event_Binder, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void) { this->event_->unbind (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h index 7dea4a58f61..f6dcac517ef 100644 --- a/TAO/tao/LF_Event_Binder.h +++ b/TAO/tao/LF_Event_Binder.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LF_Follower; /** @@ -41,9 +43,11 @@ public: private: /// Keep a reference to the leader follower - TAO_LF_Event *event_; + TAO_LF_Event * const event_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/LF_Event_Binder.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Event_Binder.inl b/TAO/tao/LF_Event_Binder.inl index 12389b6c8cb..14027194f35 100644 --- a/TAO/tao/LF_Event_Binder.inl +++ b/TAO/tao/LF_Event_Binder.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *follower) @@ -8,4 +12,4 @@ TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event, this->event_->bind (follower); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp index 42e295f27ed..7fa8bc352b6 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Event_Loop_Thread_Helper.h" @@ -7,6 +6,6 @@ # include "tao/LF_Event_Loop_Thread_Helper.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event_Loop_Thread_Helper, +ACE_RCSID (tao, + LF_Event_Loop_Thread_Helper, "$Id$") diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h index c51bf5495a8..3d5dfd95581 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.h +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @brief Helper class to enter and exit the Leader/Followers event * loop. @@ -54,6 +56,8 @@ private: int event_loop_return_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/LF_Event_Loop_Thread_Helper.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl index 62b5eada2d5..2fd8c6d98e7 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl @@ -2,13 +2,15 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE -TAO_LF_Event_Loop_Thread_Helper:: - TAO_LF_Event_Loop_Thread_Helper (TAO_Leader_Follower &leader_follower, - TAO_LF_Strategy &lf_strategy, - ACE_Time_Value *max_wait_time) - : leader_follower_ (leader_follower) - , lf_strategy_ (lf_strategy) +TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper ( + TAO_Leader_Follower &leader_follower, + TAO_LF_Strategy &lf_strategy, + ACE_Time_Value *max_wait_time) + : leader_follower_ (leader_follower) + , lf_strategy_ (lf_strategy) { this->event_loop_return_ = this->lf_strategy_.set_event_loop_thread (max_wait_time, leader_follower_); @@ -27,3 +29,5 @@ TAO_LF_Event_Loop_Thread_Helper::event_loop_return (void) const { return this->event_loop_return_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp index ccf7ca522f1..9e9cba91522 100644 --- a/TAO/tao/LF_Follower.cpp +++ b/TAO/tao/LF_Follower.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Follower.h" @@ -12,6 +11,8 @@ ACE_RCSID (tao, LF_Follower, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower) : leader_follower_ (leader_follower) , condition_ (leader_follower.lock ()) @@ -37,3 +38,4 @@ TAO_LF_Follower::signal (void) return this->condition_.signal (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower.h b/TAO/tao/LF_Follower.h index efd4a0ccbf0..b6dc6583cba 100644 --- a/TAO/tao/LF_Follower.h +++ b/TAO/tao/LF_Follower.h @@ -14,16 +14,21 @@ #define TAO_LF_FOLLOWER_H #include /**/ "ace/pre.h" -#include "ace/Intrusive_List_Node.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Condition_Thread_Mutex.h" #include "ace/Synch_Traits.h" +#include "ace/Intrusive_List_Node.h" -#include "tao/TAO_Export.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Leader_Follower; @@ -37,7 +42,7 @@ class TAO_Leader_Follower; * loop should be implemented by this class. * */ -class TAO_Export TAO_LF_Follower +class TAO_Export TAO_LF_Follower : public ACE_Intrusive_List_Node<TAO_LF_Follower> { public: @@ -64,6 +69,8 @@ private: ACE_SYNCH_CONDITION condition_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/LF_Follower.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl index b7e612b94ee..8e88e259759 100644 --- a/TAO/tao/LF_Follower.inl +++ b/TAO/tao/LF_Follower.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Leader_Follower & TAO_LF_Follower::leader_follower (void) { @@ -11,3 +15,5 @@ TAO_LF_Follower::wait (ACE_Time_Value *tv) { return this->condition_.wait (tv); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp index 99659ea63b9..4798d5c34c7 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.cpp +++ b/TAO/tao/LF_Follower_Auto_Adder.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Follower_Auto_Adder.h" @@ -7,11 +6,15 @@ # include "tao/LF_Follower_Auto_Adder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower_Auto_Adder, +ACE_RCSID (tao, + LF_Follower_Auto_Adder, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void) { this->leader_follower_.remove_follower (this->follower_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h index 468bec0c1d0..f1161f6b14f 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.h +++ b/TAO/tao/LF_Follower_Auto_Adder.h @@ -23,6 +23,8 @@ #include "tao/Leader_Follower.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @brief Implement an auto_adder-like class for the TAO_LF_Followers * allocated via a TAO_Leader_Follower set. @@ -47,6 +49,8 @@ private: TAO_LF_Follower *follower_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/LF_Follower_Auto_Adder.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Follower_Auto_Adder.inl b/TAO/tao/LF_Follower_Auto_Adder.inl index 62817754d77..0fa419366d0 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.inl +++ b/TAO/tao/LF_Follower_Auto_Adder.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_LF_Follower_Auto_Adder:: TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &lf, @@ -9,3 +13,5 @@ TAO_LF_Follower_Auto_Adder:: { (void) this->leader_follower_.add_follower (this->follower_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp index df1c8f51980..7152175eb48 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.cpp +++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Follower_Auto_Ptr.h" @@ -7,11 +6,15 @@ # include "tao/LF_Follower_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower_Auto_Ptr, +ACE_RCSID (tao, + LF_Follower_Auto_Ptr, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void) { this->leader_follower_.release_follower (this->follower_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Ptr.h b/TAO/tao/LF_Follower_Auto_Ptr.h index b1b13f5499b..52c2aae3411 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.h +++ b/TAO/tao/LF_Follower_Auto_Ptr.h @@ -23,6 +23,8 @@ #include "tao/Leader_Follower.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @brief Implement an auto_ptr-like class for the TAO_LF_Followers * allocated via a TAO_Leader_Follower set. @@ -51,6 +53,8 @@ private: TAO_LF_Follower *follower_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/LF_Follower_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl index 43deadfca37..8d933799401 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.inl +++ b/TAO/tao/LF_Follower_Auto_Ptr.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf) : leader_follower_ (lf) @@ -24,3 +28,5 @@ TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void) { return this->follower_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp index 5dcd5a60402..dfabf54471a 100644 --- a/TAO/tao/LF_Invocation_Event.cpp +++ b/TAO/tao/LF_Invocation_Event.cpp @@ -5,6 +5,8 @@ ACE_RCSID(tao, LF_Invocation_Event, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void) : TAO_LF_Event () { @@ -86,3 +88,5 @@ TAO_LF_Invocation_Event::is_state_final (void) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h index 98a836f5506..635acf16236 100644 --- a/TAO/tao/LF_Invocation_Event.h +++ b/TAO/tao/LF_Invocation_Event.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LF_Invocation_Event * @@ -77,6 +79,8 @@ private: int is_state_final (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LF_INVOCATION_EVENT_H */ diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp index 2deb35e08eb..8c30e4b4e96 100644 --- a/TAO/tao/LF_Strategy.cpp +++ b/TAO/tao/LF_Strategy.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Strategy.h" @@ -7,6 +6,10 @@ ACE_RCSID (tao, LF_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Strategy::~TAO_LF_Strategy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h index 6b665bff5f1..7b7e5753ce5 100644 --- a/TAO/tao/LF_Strategy.h +++ b/TAO/tao/LF_Strategy.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Time_Value; class TAO_Leader_Follower; @@ -68,6 +72,8 @@ public: TAO_Leader_Follower &) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LF_STRATEGY_H */ diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp index 8ae4cc0b00f..7f6294247cc 100644 --- a/TAO/tao/LF_Strategy_Complete.cpp +++ b/TAO/tao/LF_Strategy_Complete.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/LF_Strategy_Complete.h" @@ -15,6 +14,8 @@ ACE_RCSID (tao, LF_Strategy_Complete, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void) { } @@ -43,10 +44,12 @@ TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset, if (call_reset) lf.reset_event_loop_thread (); - int result = lf.elect_new_leader (); + int const result = lf.elect_new_leader (); if (result == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Failed to wake up ") ACE_TEXT ("a follower thread\n"))); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h index a0c1f4cf21d..c1a2a007135 100644 --- a/TAO/tao/LF_Strategy_Complete.h +++ b/TAO/tao/LF_Strategy_Complete.h @@ -21,6 +21,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + + + + /** * @brief A concrete TAO_LF_Strategy for ORB configurations that use * the Leader/Followers event loop. @@ -45,6 +51,8 @@ public: TAO_Leader_Follower &); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/LF_Strategy_Complete.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Strategy_Complete.inl b/TAO/tao/LF_Strategy_Complete.inl index 240b3ba5dd0..2a52ea3456a 100644 --- a/TAO/tao/LF_Strategy_Complete.inl +++ b/TAO/tao/LF_Strategy_Complete.inl @@ -1,6 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_LF_Strategy_Complete::TAO_LF_Strategy_Complete (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp index 4f814cbd1fa..ec8d70c1892 100644 --- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp @@ -3,10 +3,12 @@ #include "LRU_Connection_Purging_Strategy.h" #include "Transport.h" -ACE_RCSID (tao, - LRU_Connection_Purging_Strategy, +ACE_RCSID (tao, + LRU_Connection_Purging_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum), @@ -26,3 +28,4 @@ TAO_LRU_Connection_Purging_Strategy::update_item (TAO_Transport* transport) transport->purging_order (this->order_++); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.h b/TAO/tao/LRU_Connection_Purging_Strategy.h index 07f1fdfd307..8ea7319d723 100644 --- a/TAO/tao/LRU_Connection_Purging_Strategy.h +++ b/TAO/tao/LRU_Connection_Purging_Strategy.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // ================================================================ /** * @file LRU_Connection_Purging_Strategy.h @@ -21,6 +23,8 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LRU_Connection_Purging_Strategy * @@ -32,7 +36,7 @@ * first. */ -class TAO_Export TAO_LRU_Connection_Purging_Strategy +class TAO_Export TAO_LRU_Connection_Purging_Strategy : public TAO_Connection_Purging_Strategy { public: @@ -50,6 +54,8 @@ private: unsigned long order_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LRU_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index cd387e73f15..bb4dbf966ce 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -21,6 +21,9 @@ ACE_RCSID (tao, Leader_Follower, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Leader_Follower::~TAO_Leader_Follower (void) { while (!this->follower_free_list_.empty ()) @@ -485,3 +488,4 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, return result; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 810735673e0..e878b794330 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -28,6 +28,9 @@ #include "ace/Intrusive_List_Node.h" #include "ace/OS_NS_Thread.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LF_Event; class TAO_Transport; class TAO_ORB_Core; @@ -283,6 +286,8 @@ private: TAO_Leader_Follower &leader_follower_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/Leader_Follower.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i index 1c145aaab93..60293532455 100644 --- a/TAO/tao/Leader_Follower.i +++ b/TAO/tao/Leader_Follower.i @@ -1,4 +1,5 @@ // -*- C++ -*- +// // $Id$ // **************************************************************** @@ -6,6 +7,8 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "tao/ORB_Core.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core, TAO_New_Leader_Generator *new_leader_generator) @@ -220,3 +223,5 @@ TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void) { this->leader_follower_.reset_client_leader_thread (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index b96152bc26d..694bf8190b9 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "tao/Leader_Follower_Flushing_Strategy.h" @@ -12,6 +11,9 @@ ACE_RCSID (tao, Leader_Follower_Flushing_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Leader_Follower_Flushing_Strategy::schedule_output (TAO_Transport *transport) { @@ -67,3 +69,5 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h index 630b0302a8a..db460e4bdea 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.h +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Leader_Follower_Flushing_Strategy * @@ -39,6 +41,8 @@ public: virtual int flush_transport (TAO_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LEADER_FOLLOWER_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 39d370f23be..903112f92cc 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "LocalObject.h" @@ -19,6 +17,8 @@ ACE_RCSID (tao, LocalObject, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::LocalObject::~LocalObject (void) { } @@ -42,12 +42,12 @@ CORBA::ULong CORBA::LocalObject::_hash (CORBA::ULong maximum ACE_ENV_ARG_DECL_NOT_USED) { - // Note that we reinterpret_cast to an "unsigned long" instead of + // Note that we reinterpret_cast to an "ptrdiff_t" instead of // CORBA::ULong since we need to first cast to an integer large // enough to hold an address to avoid compile-time warnings on some // 64-bit platforms. - const CORBA::ULong hash = + CORBA::ULong const hash = static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this)); return hash % maximum; @@ -220,6 +220,10 @@ CORBA::LocalObject::_get_orb (ACE_ENV_SINGLE_ARG_DECL) // **************************************************************** +TAO_Local_RefCounted_Object::~TAO_Local_RefCounted_Object (void) +{ +} + void TAO_Local_RefCounted_Object::_add_ref (void) { @@ -235,3 +239,4 @@ TAO_Local_RefCounted_Object::_remove_ref (void) delete this; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index e7c3c8dce70..19aad779f2f 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -31,6 +31,8 @@ #include "Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class LocalObject; @@ -223,6 +225,9 @@ class TAO_Export TAO_Local_RefCounted_Object { public: + /// Destructor. + virtual ~TAO_Local_RefCounted_Object (void); + /// Increment reference count. virtual void _add_ref (void); @@ -254,6 +259,7 @@ protected: ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "LocalObject.i" diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i index 84891887973..3b84db89160 100644 --- a/TAO/tao/LocalObject.i +++ b/TAO/tao/LocalObject.i @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::LocalObject_ptr CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj) @@ -49,3 +51,5 @@ TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void) : refcount_ (1) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index 76d6ac58dd9..16aab7ef6a4 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -15,6 +15,8 @@ ACE_RCSID (tao, LocateRequest_Invocation, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { LocateRequest_Invocation::LocateRequest_Invocation ( @@ -189,3 +191,5 @@ namespace TAO return TAO_INVOKE_SUCCESS; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h index 9006ada4f05..40b213eef37 100644 --- a/TAO/tao/LocateRequest_Invocation.h +++ b/TAO/tao/LocateRequest_Invocation.h @@ -23,6 +23,8 @@ #include "tao/Synch_Invocation.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Synch_Reply_Dispatcher; namespace CORBA @@ -75,6 +77,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_LOCATEREQUEST_INVOCATION_H*/ diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 527999bff53..63d9c1b79b8 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -10,12 +10,14 @@ ACE_RCSID (tao, LocateRequest_Invocation_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { LocateRequest_Invocation_Adapter::LocateRequest_Invocation_Adapter ( - CORBA::Object *target) + CORBA::Object *target) : target_ (target) - , list_ (0) + , list_ (0) { } @@ -111,3 +113,5 @@ namespace TAO return has_timeout; } } // End namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h index 64d7a59bbea..5dccff7230f 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.h +++ b/TAO/tao/LocateRequest_Invocation_Adapter.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Object; @@ -68,6 +70,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_LOCATEREQUEST_INVOCATION_ADAPTER_H*/ diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 8633bca81d9..bc60a51a6a1 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -22,11 +22,13 @@ ACE_RCSID (tao, static const char mcast_prefix[] = "mcast:"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_MCAST_Parser::~TAO_MCAST_Parser (void) { } - int TAO_MCAST_Parser::match_prefix (const char *ior_string) const { @@ -508,6 +510,8 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name) -1).c_str (); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser, ACE_TEXT ("MCAST_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index 4dc327b33b5..d1e1bfb1879 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -24,6 +24,8 @@ #include "tao/CORBA_String.h" #include "tao/IOR_Parser.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_MCAST_Parser * @@ -85,6 +87,8 @@ private: CORBA::String_var service_name_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "MCAST_Parser.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/MCAST_Parser.i b/TAO/tao/MCAST_Parser.i index c2a5c736f82..fc19f658c44 100644 --- a/TAO/tao/MCAST_Parser.i +++ b/TAO/tao/MCAST_Parser.i @@ -1,6 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_MCAST_Parser::TAO_MCAST_Parser (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index cc6fb34f23d..e6362be15a0 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -19,6 +19,7 @@ ACE_RCSID (tao, # include "tao/MProfile.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_MProfile::~TAO_MProfile (void) { @@ -360,3 +361,5 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) return ret_val; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 194027593d5..ba45b3a4a5d 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -29,6 +29,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations class TAO_Profile; namespace CORBA @@ -240,6 +242,8 @@ private: TAO_PHandle last_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/MProfile.i" #endif /*__ACE_INLINE__ */ diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i index 48805e3c14d..7992f28aa06 100644 --- a/TAO/tao/MProfile.i +++ b/TAO/tao/MProfile.i @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_MProfile::TAO_MProfile (CORBA::ULong sz) : policy_list_ (0), @@ -196,3 +198,5 @@ TAO_MProfile::policy_list (CORBA::PolicyList *policy_list) { this->policy_list_ = policy_list; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp index 5c2b8ed152f..1334d4ac165 100644 --- a/TAO/tao/Managed_Types.cpp +++ b/TAO/tao/Managed_Types.cpp @@ -10,12 +10,20 @@ ACE_RCSID (tao, Managed_Types, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // assignment from CORBA::String_var makes a copy TAO_String_Manager& TAO_String_Manager::operator= (const CORBA::String_var &var) { - CORBA::string_free (this->ptr_); - this->ptr_ = CORBA::string_dup (var.in ()); + // Strongly exception safe by means of copy and non-throwing swap + // technique. + TAO_String_Manager tmp (var.in ()); + + char * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_ptr; + return *this; } @@ -38,8 +46,14 @@ TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var) TAO_WString_Manager& TAO_WString_Manager::operator= (const CORBA::WString_var &var) { - CORBA::wstring_free (this->ptr_); - this->ptr_ = CORBA::wstring_dup (var.in ()); + // Strongly exception safe by means of copy and non-throwing swap + // technique. + TAO_WString_Manager tmp (var.in ()); + + CORBA::WChar * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_ptr; + return *this; } @@ -55,3 +69,5 @@ TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var) *this->ptr_ = CORBA::wstring_dup (var.in ()); return *this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h index 1578fab011d..fef6ad3c28b 100644 --- a/TAO/tao/Managed_Types.h +++ b/TAO/tao/Managed_Types.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ /****************************************************************/ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_String_Manager * @@ -46,7 +48,7 @@ public: /// copy constructor TAO_String_Manager (const TAO_String_Manager &); - + /// constructor from const char* makes a copy. TAO_String_Manager (const char *); @@ -329,6 +331,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Managed_Types.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i index bbf065dd043..aa03deb7c56 100644 --- a/TAO/tao/Managed_Types.i +++ b/TAO/tao/Managed_Types.i @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ // ============================================================================ @@ -16,6 +17,8 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // default CTOR initializes to empty string ACE_INLINE TAO_String_Manager::TAO_String_Manager (void) @@ -47,11 +50,14 @@ TAO_String_Manager::~TAO_String_Manager (void) ACE_INLINE TAO_String_Manager& TAO_String_Manager::operator= (const TAO_String_Manager &rhs) { - if (this == &rhs) - return *this; + // Strongly exception safe by means of copy and non-throwing swap + // technique. + TAO_String_Manager tmp (rhs); + + char * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_ptr; - CORBA::string_free (this->ptr_); - this->ptr_ = CORBA::string_dup (rhs.ptr_); return *this; } @@ -59,8 +65,14 @@ TAO_String_Manager::operator= (const TAO_String_Manager &rhs) ACE_INLINE TAO_String_Manager & TAO_String_Manager::operator= (const char * p) { - CORBA::string_free (this->ptr_); - this->ptr_ = CORBA::string_dup (p); + // Strongly exception safe by means of copy and non-throwing swap + // technique. + TAO_String_Manager tmp (p); + + char * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_ptr; + return *this; } @@ -231,11 +243,14 @@ TAO_WString_Manager::~TAO_WString_Manager (void) ACE_INLINE TAO_WString_Manager& TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs) { - if (this == &rhs) - return *this; + // Strongly exception safe by means of copy and non-throwing swap + // technique. + TAO_WString_Manager tmp (rhs); + + CORBA::WChar * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_ptr; - CORBA::wstring_free (this->ptr_); - this->ptr_ = CORBA::wstring_dup (rhs.ptr_); return *this; } @@ -243,8 +258,14 @@ TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs) ACE_INLINE TAO_WString_Manager & TAO_WString_Manager::operator= (const CORBA::WChar * p) { - CORBA::wstring_free (this->ptr_); - this->ptr_ = CORBA::wstring_dup (p); + // Strongly exception safe by means of copy and non-throwing swap + // technique. + TAO_WString_Manager tmp (p); + + CORBA::WChar * old_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = old_ptr; + return *this; } @@ -382,3 +403,5 @@ TAO_SeqElem_WString_Manager::_retn (void) *this->ptr_ = 0; return temp; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 5e8e70d012a..8afed3554fe 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -11,6 +11,8 @@ ACE_RCSID (tao, Muxed_TMS, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport) , request_id_generator_ (0) @@ -201,7 +203,7 @@ TAO_Muxed_TMS::clear_cache (void) if (this->dispatcher_table_.current_size () == 0) return -1; - REQUEST_DISPATCHER_TABLE::ITERATOR end = + REQUEST_DISPATCHER_TABLE::ITERATOR const end = this->dispatcher_table_.end (); ACE_Unbounded_Stack <TAO_Reply_Dispatcher *> ubs; @@ -213,7 +215,7 @@ TAO_Muxed_TMS::clear_cache (void) ubs.push ((*i).int_id_); this->dispatcher_table_.unbind_all (); - size_t sz = ubs.size (); + size_t const sz = ubs.size (); for (size_t k = 0 ; k != sz ; ++k) { @@ -227,3 +229,4 @@ TAO_Muxed_TMS::clear_cache (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index 30b055963b3..77aa902177a 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -15,15 +15,18 @@ #define TAO_MUXED_TMS_H #include /**/ "ace/pre.h" -#include "ace/Hash_Map_Manager_T.h" + +#include "tao/Transport_Mux_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" -#include "tao/Transport_Mux_Strategy.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; class TAO_Pluggable_Reply_Params; @@ -88,6 +91,8 @@ protected: int clear_cache (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* MUXED_TMS_H */ diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp index a79fd8fde97..063f473ac6d 100644 --- a/TAO/tao/NVList_Adapter.cpp +++ b/TAO/tao/NVList_Adapter.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "tao/NVList_Adapter.h" @@ -6,7 +6,10 @@ ACE_RCSID (tao, NVList_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_NVList_Adapter::~TAO_NVList_Adapter (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index 207d5c2e014..e9bc13af0ec 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,10 +21,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" #include "tao/Basic_Types.h" + +#include "ace/Service_Object.h" #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class NVList; @@ -55,5 +58,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NVLIST_ADAPTER_H */ diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp index 3139d42ad27..5b540d4df6c 100644 --- a/TAO/tao/New_Leader_Generator.cpp +++ b/TAO/tao/New_Leader_Generator.cpp @@ -8,6 +8,10 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h index 17d4dd6cae1..fdb96209dea 100644 --- a/TAO/tao/New_Leader_Generator.h +++ b/TAO/tao/New_Leader_Generator.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_New_Leader_Generator * @@ -42,6 +44,8 @@ public: virtual void no_leaders_available (void) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NEW_LEADER_GENERATOR_H */ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 2e953836040..aadec2a4e02 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -51,7 +51,6 @@ void TAO_unexpected_exception_handler (void) } #endif /* ACE_HAS_EXCEPTIONS */ - static const char ior_prefix[] = "IOR:"; // = Static initialization. @@ -64,6 +63,8 @@ namespace // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::ORB::InvalidName::InvalidName (void) : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", "InvalidName") @@ -2021,3 +2022,4 @@ CORBA::ORB::lookup_value_factory (const char *repository_id return this->orb_core ()->valuetype_adapter ()->vf_map_find (repository_id); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index cecd70319ed..0ab89e82c80 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -37,6 +37,8 @@ #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef enum { TAO_SERVICEID_NAMESERVICE, @@ -670,6 +672,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/ORB.i" diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i index 16a9d6be7e6..81c1e4ae8e0 100644 --- a/TAO/tao/ORB.i +++ b/TAO/tao/ORB.i @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // --------------------------------------------------------------------------- // ORB specific @@ -10,9 +11,9 @@ ACE_INLINE CORBA::ULong CORBA::ORB::_incr_refcnt (void) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, - guard, - lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, + guard, + lock_, 0); return ++this->refcount_; } @@ -88,3 +89,4 @@ CORBA::release (CORBA::ORB_ptr obj) obj->_decr_refcnt (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index b025c20488c..5f1646ae7b6 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -19,6 +19,8 @@ ACE_RCSID (tao, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { void @@ -84,3 +86,4 @@ namespace PortableInterceptor } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 0169e5df76b..0864d35f125 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -15,15 +15,18 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Environment.h" +#include "tao/default_environment.h" + #include "ace/CORBA_macros.h" -#include "Environment.h" -#include "default_environment.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { @@ -38,6 +41,8 @@ namespace PortableInterceptor ); } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORB_INITIALIZER_REGISTRY_H */ diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp index 75cd36c8285..c55f31a03c2 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp +++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp @@ -1,4 +1,4 @@ -//$Id$ +// $Id$ #include "ORBInitializer_Registry_Adapter.h" @@ -6,9 +6,13 @@ ACE_RCSID (tao, ORBInitializer_Registry_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter (void) { } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index ffd9b863d58..4515f10ec11 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -15,16 +15,18 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" #include "tao/Basic_Types.h" #include "tao/SystemException.h" +#include "ace/Service_Object.h" +#include "ace/CORBA_macros.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; @@ -95,6 +97,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORB_INITIALIZER_REGISTRY_ADAPTER_H */ diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h index 6e324f0f908..b7e090dcedf 100644 --- a/TAO/tao/ORB_Constants.h +++ b/TAO/tao/ORB_Constants.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // A hash define for the regular two way operation. #define TAO_TWOWAY_RESPONSE_FLAG 255 @@ -234,6 +236,8 @@ const CORBA::ULong TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE = (0x15U << 7); //@} //@} +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORB_CONSTANTS_H */ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 946aeb55f14..19d90dd4934 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -75,6 +75,8 @@ ACE_RCSID (tao, ORB_Core, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // **************************************************************** CORBA::Environment& @@ -3121,3 +3123,4 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object return TAO::TAO_CS_REMOTE_STRATEGY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 5a10589e734..22db8c09315 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -38,6 +38,13 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "ace/Array_Map.h" +#include "ace/Thread_Manager.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/TSS_T.h" + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if TAO_HAS_INTERCEPTORS == 1 namespace TAO @@ -48,10 +55,6 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ -#include "ace/Thread_Manager.h" -#include "ace/Lock_Adapter_T.h" -#include "ace/TSS_T.h" - // Forward declarations class ACE_Data_Block; @@ -1368,6 +1371,8 @@ TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "ORB_Core.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 9a0eb2e3a5b..603b923734c 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -5,6 +5,7 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "tao/ORB_Table.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong TAO_ORB_Core::_incr_refcnt (void) @@ -638,3 +639,5 @@ TAO_ORB_Core::serverrequestinterceptor_adapter (void) } #endif /* TAO_HAS_INTERCEPTORS */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp index a0b908a54dd..79a3ab24c05 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.cpp +++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp @@ -9,6 +9,8 @@ ACE_RCSID (tao, ORB_Core_Auto_Ptr, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void) { if (this->get () != 0) @@ -27,3 +29,5 @@ TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p) this->p_ = p; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h index f99c4f79a9d..bdd016a35c1 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.h +++ b/TAO/tao/ORB_Core_Auto_Ptr.h @@ -18,6 +18,14 @@ #include "tao/TAO_Export.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; /** @@ -60,6 +68,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "ORB_Core_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl index 50cc45b0bb5..d9bd041e77c 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.inl +++ b/TAO/tao/ORB_Core_Auto_Ptr.inl @@ -2,6 +2,9 @@ // // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p) : p_ (p) @@ -52,3 +55,5 @@ TAO_ORB_Core_Auto_Ptr::operator *() const // @@ Potential problem if this->p_ is zero! return *this->get (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp index a9d364e90f2..64d57768dba 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.cpp +++ b/TAO/tao/ORB_Core_TSS_Resources.cpp @@ -2,6 +2,8 @@ #include "tao/ORB_Core_TSS_Resources.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void) : event_loop_thread_ (0) , client_leader_thread_ (0) @@ -27,4 +29,4 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void) // this->orb_core_->tss_cleanup_funcs ()->cleanup (this->ts_objects_); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h index 9488216500e..8f5e0c3abb8 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.h +++ b/TAO/tao/ORB_Core_TSS_Resources.h @@ -22,8 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Array_Base.h" #include "tao/orbconf.h" +#include "ace/Array_Base.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; @@ -83,7 +85,7 @@ public: TAO_ORB_Core *orb_core_; }; - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_ORB_CORE_H */ diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index e313b23ad18..27f48d6ee35 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -17,6 +17,8 @@ ACE_RCSID (tao, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::ORB_Table::ORB_Table (void) : lock_ (), first_orb_not_default_ (false), @@ -180,3 +182,5 @@ TAO::ORB_Table::instance (void) #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index 1b35ae545b0..ce2bf194cf8 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -29,6 +29,7 @@ #include "ace/Array_Map.h" #include "ace/Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. class TAO_ORB_Core; @@ -198,6 +199,8 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/ORB_Table.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl index cef161c5c7f..9bce09a0f6f 100644 --- a/TAO/tao/ORB_Table.inl +++ b/TAO/tao/ORB_Table.inl @@ -4,6 +4,7 @@ #include "tao/ORB_Core.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * TAO::ORB_Table::first_orb (void) @@ -83,3 +84,5 @@ TAO::ORB_Core_Ref_Counter::operator= (TAO::ORB_Core_Ref_Counter const & rhs) TAO::ORB_Core_Ref_Counter tmp (rhs); std::swap (this->core_, tmp.core_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 22a29290790..adb2c4f5c28 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -33,6 +33,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Object::~Object (void) { if (this->protocol_proxy_) @@ -1014,3 +1016,5 @@ TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) CORBA::Object_ptr obj ) = 0; + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 548cf871edd..4b0fc06ce8f 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -39,6 +39,8 @@ # undef IOR #endif /* HPUX && IOR */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Stub; class TAO_Abstract_ServantBase; class TAO_ORB_Core; @@ -458,6 +460,7 @@ operator<< (TAO_OutputCDR&, const CORBA::Object*); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR&, CORBA::Object *&); +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Object.i" diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index e86207df933..d0f031ab367 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -4,6 +4,8 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Object::Object (int) : servant_ (0), @@ -104,3 +106,5 @@ CORBA::Object::ior (void) const { return this->ior_.in (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index ab186bbfaef..d5e28d94c1b 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -8,6 +8,9 @@ ACE_RCSID(tao, ObjectKey_Table, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, const TAO::ObjectKey &rhs) const @@ -28,9 +31,9 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, return 1; } else if (lhs[i] > rhs[i]) - { - return 0; - } + { + return 0; + } } return 0; @@ -180,3 +183,4 @@ TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index db3027c7d05..ef55ed9facd 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -23,6 +23,9 @@ #include "ace/Null_Mutex.h" #include "tao/Object_KeyC.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations class TAO_ORB_Core; @@ -136,6 +139,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_OBJECT_KEY_TABLE_H*/ diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index 9d949775999..7ddc254c6d8 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_OBJECT_ARGUMENT_T_C -#define TAO_OBJECT_ARGUMENT_T_C +#ifndef TAO_OBJECT_ARGUMENT_T_CPP +#define TAO_OBJECT_ARGUMENT_T_CPP #include "tao/Object_Argument_T.h" @@ -9,9 +9,7 @@ #include "tao/Object_Argument_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Object_Argument_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, typename Insert_Policy> CORBA::Boolean @@ -102,4 +100,6 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -#endif /* TAO_OBJECT_ARGUMENT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_OBJECT_ARGUMENT_T_CPP */ diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index b5157e3616f..a5c0f8b7a71 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -151,6 +153,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/Object_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index b4a778c9299..f8105b5a561 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S_ptr, typename Insert_Policy> ACE_INLINE TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::In_Object_Argument_T (S_ptr x) @@ -81,3 +83,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void) return this->x_._retn (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp index b510b74bcc4..6ffb86a0d59 100644 --- a/TAO/tao/Object_Loader.cpp +++ b/TAO/tao/Object_Loader.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Object_Loader.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Object_Loader, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Object_Loader::~TAO_Object_Loader (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index fd9279e1fd0..69b1a7559bc 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // ================================================================ /** * @file Object_Loader.h @@ -20,6 +22,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Object; @@ -60,5 +64,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_OBJECT_LOADER_H */ diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp index b718a9886ea..8a8a1d6ee09 100644 --- a/TAO/tao/Object_Proxy_Broker.cpp +++ b/TAO/tao/Object_Proxy_Broker.cpp @@ -1,13 +1,15 @@ +// $Id$ + #include "tao/Object_Proxy_Broker.h" ACE_RCSID (tao, - TAO_Object_Proxy_Broker, + Object_Proxy_Broker, "$Id$") -namespace TAO +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void) { - Object_Proxy_Broker::~Object_Proxy_Broker (void) - { - // No-Op. - } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index 1d1e35f0c1a..0c1b7dc2102 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -30,6 +30,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class InterfaceDef; @@ -79,6 +81,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OBJECT_PROXY_BROKER_H_ */ diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 2e68e4f4eed..7042b31054b 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -22,6 +22,8 @@ ACE_RCSID (tao, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Object_Ref_Table::bind (const char *id, CORBA::Object_ptr obj) @@ -81,3 +83,5 @@ TAO_Object_Ref_Table::find (const char *id) return CORBA::Object::_duplicate ((*found).second.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 014463862e1..e21f7a4a000 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -28,6 +28,8 @@ #include "ace/Array_Map.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Environment; @@ -118,6 +120,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/Object_Ref_Table.inl" diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index e2cc5ccccab..5e5f898c60b 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE) @@ -60,3 +62,5 @@ TAO_Object_Ref_Table::unbind (const char *id) return (this->table_.erase (CORBA::String_var (id)) == 0 ? -1 : 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 69ad710c664..706d9d3dbee 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -1,14 +1,13 @@ // $Id$ -#ifndef TAO_OBJECT_T_C -#define TAO_OBJECT_T_C + +#ifndef TAO_OBJECT_T_CPP +#define TAO_OBJECT_T_CPP #include "tao/Object_T.h" #include "tao/Stub.h" #include "tao/SystemException.h" -ACE_RCSID (tao, - Object_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -88,7 +87,7 @@ namespace TAO { return proxy; } - + TAO_Stub* stub = obj->_stubobj (); if (stub == 0) @@ -132,4 +131,6 @@ namespace TAO } } -#endif /* TAO_OBJECT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_OBJECT_T_CPP */ diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h index 57c11c5950a..c4cfd88230c 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -17,8 +17,17 @@ #include /**/ "ace/pre.h" +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Versioned_Namespace.h" #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Object; @@ -58,6 +67,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Object_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index 0a93b48c86a..6c3ab3e046c 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -1,13 +1,11 @@ // $Id$ -#ifndef TAO_OBJREF_VAROUT_T_C -#define TAO_OBJREF_VAROUT_T_C +#ifndef TAO_OBJREF_VAROUT_T_CPP +#define TAO_OBJREF_VAROUT_T_CPP #include "tao/Objref_VarOut_T.h" #include "tao/Environment.h" -ACE_RCSID (tao, - Objref_VarOut_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void) @@ -202,4 +200,6 @@ TAO_Objref_Out_T<T>::operator-> (void) return this->ptr_; } -#endif /* TAO_OBJREF_VAROUT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_OBJREF_VAROUT_T_CPP */ diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index f3fc6ac260f..55f876160a0 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -24,6 +24,8 @@ #include "tao/Basic_Types.h" #include "tao/varbase.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_OutputCDR; namespace TAO @@ -125,6 +127,8 @@ private: T *& ptr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Objref_VarOut_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp index 5271761663e..1d6d96930ab 100644 --- a/TAO/tao/Protocol_Factory.cpp +++ b/TAO/tao/Protocol_Factory.cpp @@ -1,13 +1,14 @@ // $Id$ #include "Protocol_Factory.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Protocol_Factory, "$Id$") -static const char prefix_[] = "\0"; +static const char the_prefix[] = ""; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag) : tag_ (tag) @@ -52,7 +53,7 @@ TAO_Protocol_Factory::match_prefix (const ACE_CString & /* prefix */) const char * TAO_Protocol_Factory::prefix (void) const { - return ::prefix_; + return ::the_prefix; } char @@ -61,3 +62,4 @@ TAO_Protocol_Factory::options_delimiter (void) const return '\0'; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 568be711664..7e0bcb71b0c 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -14,16 +14,19 @@ #define TAO_PROTOCOL_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Basic_Types.h" + +#include "ace/Service_Object.h" #include "ace/SStringfwd.h" -#include "TAO_Export.h" -#include "Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Acceptor; class TAO_Connector; @@ -68,10 +71,14 @@ public: virtual int requires_explicit_endpoint (void) const = 0; private: + /// IOP protocol tag. - CORBA::ULong tag_; + CORBA::ULong const tag_; + }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PROTOCOL_FACTORY_H */ diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 7ab5c57e770..7ac209c41bd 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -13,6 +13,8 @@ ACE_RCSID (tao, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name) : name_ (name), factory_ (0), @@ -216,3 +218,4 @@ TAO_Resource_Factory::load_default_protocols (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 65ec7222957..139549d5440 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -15,17 +15,22 @@ #define TAO_RESOURCE_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +#include "ace/Service_Object.h" #include "ace/Unbounded_Set.h" #include "ace/SString.h" #include "ace/CDR_Base.h" -#include "tao/TAO_Export.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Protocol_Factory; class TAO_Acceptor_Registry; @@ -253,6 +258,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_RESOURCE_FACTORY_H */ diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp index 8540e33e402..b49d7ccdbd2 100644 --- a/TAO/tao/Stub_Factory.cpp +++ b/TAO/tao/Stub_Factory.cpp @@ -1,13 +1,15 @@ // $Id$ + #include "Stub_Factory.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (tao, TAO_Stub_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Stub_Factory::~TAO_Stub_Factory (void) { - // No-Op. } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h index 4effc5450ac..ef42462eac1 100644 --- a/TAO/tao/Stub_Factory.h +++ b/TAO/tao/Stub_Factory.h @@ -19,15 +19,19 @@ #define TAO_STUB_FACTORY_H_ #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Service_Object.h" +#include "ace/CORBA_macros.h" -#include "tao/TAO_Export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward references class TAO_MProfile; @@ -52,7 +56,7 @@ namespace CORBA class TAO_Export TAO_Stub_Factory : public ACE_Service_Object { public: - // -- Ctor/Dtor -- + /// Destructor. virtual ~TAO_Stub_Factory (void); /// Creates a Stub Object. @@ -62,5 +66,7 @@ public: ACE_ENV_ARG_DECL) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_STUB_FACTORY_H_ */ diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index cbd6be69009..47915050b97 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -23,6 +23,9 @@ #include "ace/Service_Object.h" #include "tao/TAO_Export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; class TAO_Thread_Lane_Resources; @@ -104,12 +107,14 @@ public: virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void); /// Factory method. - virtual - TAO_Thread_Lane_Resources_Manager * + virtual TAO_Thread_Lane_Resources_Manager * create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + + #include /**/ "ace/post.h" #endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */ diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index a21cdf54427..fe1bb730e4f 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp deleted file mode 100644 index bb988ed34ba..00000000000 --- a/TAO/tao/corbafwd.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "corbafwd.h" - -ACE_RCSID (tao, - corbafwd, - "$Id$") diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp index d1cfdd93b16..3b2fdad7cb4 100644 --- a/TAO/tao/debug.cpp +++ b/TAO/tao/debug.cpp @@ -11,4 +11,8 @@ ACE_RCSID (tao, debug, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Export unsigned int TAO_debug_level = 0; + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h index 1ca35af44d1..6bd37a2341c 100644 --- a/TAO/tao/debug.h +++ b/TAO/tao/debug.h @@ -22,6 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // These are global to simplify is use by other code, very much in // particular by getopt and related argument-parsing code // @@ -34,5 +38,7 @@ extern TAO_Export unsigned int TAO_debug_level; // debug messages on (1) or off (0) extern TAO_Export unsigned int TAO_orbdebug; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEBUG_H */ diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index e2d4b28f9d1..438bdcd235f 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -23,6 +23,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) : profile_lock_type_ (TAO_THREAD_LOCK) , transport_mux_strategy_ (TAO_MUXED_TMS) @@ -383,6 +385,8 @@ TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const return this->use_cleanup_options_; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index 0da7020d23a..db6544d166d 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "tao/Client_Strategy_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Default_Client_Strategy_Factory * @@ -115,6 +117,8 @@ private: bool use_cleanup_options_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory) diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h index 45ded1f6f06..a535b1fa05a 100644 --- a/TAO/tao/default_environment.h +++ b/TAO/tao/default_environment.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Environment; @@ -34,6 +36,8 @@ namespace CORBA */ TAO_Export CORBA::Environment& TAO_default_environment (void); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_ENVIRONMENT_H */ diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 04ca1c07c60..77619868f74 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -31,6 +31,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) : use_locked_data_blocks_ (1) , parser_names_count_ (0) @@ -1083,6 +1085,8 @@ TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const return this->drop_replies_; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 8cbc1344a40..ef388ec4f64 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -24,6 +24,8 @@ #include "tao/Resource_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Object_Adapter; class TAO_IOR_Parser; class TAO_LF_Strategy; @@ -247,6 +249,8 @@ private: bool drop_replies_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory) diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index c74c5065ef7..3ebc4dadc7f 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -9,6 +9,8 @@ ACE_RCSID (tao, default_server, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) : activate_server_connections_ (0), thread_flags_ (THR_BOUND | THR_DETACHED), @@ -380,6 +382,8 @@ TAO_Default_Server_Strategy_Factory::report_option_value_error ( option_value, option_name)); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory, ACE_TEXT ("Server_Strategy_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h index f1be2f0615e..40d8f6cad7d 100644 --- a/TAO/tao/objectid.h +++ b/TAO/tao/objectid.h @@ -23,6 +23,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* * * This file is a break away from orbconf.h. Basically orbconf.h is @@ -103,5 +107,7 @@ namespace TAO /// No. of services locatable through multicast. #define TAO_NO_OF_MCAST_SERVICES 4 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_OBJECTID_H*/ diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index c75ced2a83f..2aa3cd2b972 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -17,6 +17,8 @@ ACE_RCSID (tao, operation_details, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Exception * TAO_Operation_Details::corba_exception (const char *id ACE_ENV_ARG_DECL) @@ -75,3 +77,4 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr) return true; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 241635d7a20..d10dc54ed11 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** * @file operation_details.h @@ -25,6 +25,8 @@ #include "target_specification.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations namespace Dynamic { @@ -210,6 +212,8 @@ private: #endif /*TAO_HAS_INTERCEPTORS == 1*/ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "operation_details.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i index 3c59cafd320..a570229cf4b 100644 --- a/TAO/tao/operation_details.i +++ b/TAO/tao/operation_details.i @@ -2,6 +2,8 @@ // //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Operation_Details::TAO_Operation_Details (const char *name, CORBA::ULong len, @@ -194,3 +196,5 @@ TAO_Operation_Details::ft_retention_id (void) const return this->ft_retention_id_; } #endif /*TAO_HAS_INTERCEPTORS == 1*/ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index da52c94ba3f..7ca3f1959bc 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -25,12 +25,16 @@ #include "ace/Global_Macros.h" #include "ace/Synch_Traits.h" -#define TAO_INVALID_PRIORITY -1 - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +#define TAO_INVALID_PRIORITY -1 + #if !defined (TAO_REACTOR) #define TAO_REACTOR ACE_Select_Reactor #endif /* TAO_REACTOR */ @@ -876,6 +880,8 @@ enum TAO_Policy_Scope #define TAO_RESET_OUTPUT_CDR_AFTER_SEND 0 #endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORBCONF_H */ diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index b54ca557854..24ed65031f7 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -510,6 +510,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { VarOut_T.h Var_Size_Argument_T.h Version.h + Version_Namespace.h Wait_On_Leader_Follower.h Wait_On_LF_No_Upcall.h Wait_On_Reactor.h |