summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-11-02 11:03:27 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-11-02 11:03:27 +0000
commit688ba8920d2a0804caa8b8321c97d6f85e950dd3 (patch)
tree7b729be96bfa676f133f562057cf68f0b4b9ca5e /TAO/tao
parent44898ad83aa0c59bcfba8f0299d76362f1c6a68b (diff)
downloadATCD-688ba8920d2a0804caa8b8321c97d6f85e950dd3.tar.gz
ChangeLogTag:Tue Nov 1 14:49:40 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Acceptor_Registry.h6
-rw-r--r--TAO/tao/Asynch_Reply_Dispatcher_Base.h10
-rw-r--r--TAO/tao/Client_Strategy_Factory.h3
-rw-r--r--TAO/tao/Codeset_Manager.h4
-rw-r--r--TAO/tao/Codeset_Translator_Base.h7
-rw-r--r--TAO/tao/Condition.h4
-rw-r--r--TAO/tao/Connect_Strategy.h5
-rw-r--r--TAO/tao/Connection_Handler.h7
-rw-r--r--TAO/tao/Connector_Impl.h3
-rw-r--r--TAO/tao/Exception.h4
-rw-r--r--TAO/tao/Fault_Tolerance_Service.h4
-rw-r--r--TAO/tao/Flushing_Strategy.h3
-rw-r--r--TAO/tao/GIOP_Utils.h5
-rw-r--r--TAO/tao/GUIResource_Factory.h14
-rw-r--r--TAO/tao/IORInterceptor_Adapter.h4
-rw-r--r--TAO/tao/Incoming_Message_Queue.h4
-rw-r--r--TAO/tao/Invocation_Adapter.h4
-rw-r--r--TAO/tao/Invocation_Endpoint_Selectors.h2
-rw-r--r--TAO/tao/LF_Connect_Strategy.h5
-rw-r--r--TAO/tao/LF_Strategy.h3
-rw-r--r--TAO/tao/Leader_Follower.h2
-rw-r--r--TAO/tao/LocateRequest_Invocation_Adapter.h4
-rw-r--r--TAO/tao/ORB_Core.h4
-rw-r--r--TAO/tao/Object.h4
-rw-r--r--TAO/tao/Parser_Registry.cpp4
-rw-r--r--TAO/tao/Parser_Registry.h11
-rw-r--r--TAO/tao/Parser_Registry.i6
-rw-r--r--TAO/tao/Pluggable_Messaging.cpp6
-rw-r--r--TAO/tao/Pluggable_Messaging.h8
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.cpp10
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.h5
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.i4
-rw-r--r--TAO/tao/PolicyFactory_Registry_Adapter.cpp11
-rw-r--r--TAO/tao/PolicyFactory_Registry_Adapter.h8
-rw-r--r--TAO/tao/Policy_Current.cpp7
-rw-r--r--TAO/tao/Policy_Current.h10
-rw-r--r--TAO/tao/Policy_Current.inl5
-rw-r--r--TAO/tao/Policy_Current_Impl.cpp4
-rw-r--r--TAO/tao/Policy_Current_Impl.h6
-rw-r--r--TAO/tao/Policy_Current_Impl.inl5
-rw-r--r--TAO/tao/Policy_Manager.cpp3
-rw-r--r--TAO/tao/Policy_Manager.h9
-rw-r--r--TAO/tao/Policy_Manager.i4
-rw-r--r--TAO/tao/Policy_Set.cpp11
-rw-r--r--TAO/tao/Policy_Set.h6
-rw-r--r--TAO/tao/Policy_Set.i16
-rw-r--r--TAO/tao/Policy_Validator.cpp13
-rw-r--r--TAO/tao/Policy_Validator.h8
-rw-r--r--TAO/tao/Principal.cpp4
-rw-r--r--TAO/tao/Principal.h14
-rw-r--r--TAO/tao/Principal.i3
-rw-r--r--TAO/tao/Profile.cpp5
-rw-r--r--TAO/tao/Profile.h5
-rw-r--r--TAO/tao/Profile.i5
-rw-r--r--TAO/tao/Profile_Transport_Resolver.cpp4
-rw-r--r--TAO/tao/Profile_Transport_Resolver.h7
-rw-r--r--TAO/tao/Profile_Transport_Resolver.inl19
-rw-r--r--TAO/tao/Protocols_Hooks.cpp4
-rw-r--r--TAO/tao/Protocols_Hooks.h5
-rw-r--r--TAO/tao/Pseudo_VarOut_T.cpp13
-rw-r--r--TAO/tao/Pseudo_VarOut_T.h4
-rw-r--r--TAO/tao/Pseudo_VarOut_T.inl4
-rw-r--r--TAO/tao/QtResource_Factory.cpp7
-rw-r--r--TAO/tao/QtResource_Factory.h5
-rw-r--r--TAO/tao/QtResource_Loader.cpp4
-rw-r--r--TAO/tao/QtResource_Loader.h10
-rw-r--r--TAO/tao/Queued_Message.cpp6
-rw-r--r--TAO/tao/Queued_Message.h5
-rw-r--r--TAO/tao/Reactive_Connect_Strategy.cpp6
-rw-r--r--TAO/tao/Reactive_Connect_Strategy.h11
-rw-r--r--TAO/tao/Reactive_Flushing_Strategy.cpp5
-rw-r--r--TAO/tao/Reactive_Flushing_Strategy.h4
-rw-r--r--TAO/tao/Refcounted_ObjectKey.cpp5
-rw-r--r--TAO/tao/Refcounted_ObjectKey.h4
-rw-r--r--TAO/tao/Refcounted_ObjectKey.inl9
-rw-r--r--TAO/tao/Remote_Invocation.cpp4
-rw-r--r--TAO/tao/Remote_Invocation.h4
-rw-r--r--TAO/tao/Remote_Object_Proxy_Broker.cpp5
-rw-r--r--TAO/tao/Remote_Object_Proxy_Broker.h4
-rw-r--r--TAO/tao/Reply_Dispatcher.cpp4
-rw-r--r--TAO/tao/Reply_Dispatcher.h6
-rw-r--r--TAO/tao/Reply_Dispatcher.i7
-rw-r--r--TAO/tao/Request_Dispatcher.cpp4
-rw-r--r--TAO/tao/Request_Dispatcher.h4
-rw-r--r--TAO/tao/Resource_Factory.h3
-rw-r--r--TAO/tao/Resume_Handle.cpp5
-rw-r--r--TAO/tao/Resume_Handle.h8
-rw-r--r--TAO/tao/Resume_Handle.inl8
-rw-r--r--TAO/tao/Seq_Out_T.cpp12
-rw-r--r--TAO/tao/Seq_Out_T.h3
-rw-r--r--TAO/tao/Seq_Out_T.inl6
-rw-r--r--TAO/tao/Seq_Var_T.cpp144
-rw-r--r--TAO/tao/Seq_Var_T.h6
-rw-r--r--TAO/tao/Seq_Var_T.inl31
-rw-r--r--TAO/tao/Sequence.cpp4
-rw-r--r--TAO/tao/Sequence.h8
-rw-r--r--TAO/tao/Sequence.i8
-rw-r--r--TAO/tao/Sequence_T.cpp16
-rw-r--r--TAO/tao/Sequence_T.h4
-rw-r--r--TAO/tao/Sequence_T.i7
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter.cpp9
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter.h11
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp4
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter_Factory.h7
-rw-r--r--TAO/tao/Server_Strategy_Factory.cpp5
-rw-r--r--TAO/tao/Server_Strategy_Factory.h6
-rw-r--r--TAO/tao/Service_Callbacks.cpp5
-rw-r--r--TAO/tao/Service_Callbacks.h7
-rw-r--r--TAO/tao/Service_Context.cpp7
-rw-r--r--TAO/tao/Service_Context.h6
-rw-r--r--TAO/tao/Service_Context.inl5
-rw-r--r--TAO/tao/Services_Activate.cpp5
-rw-r--r--TAO/tao/Services_Activate.h7
-rw-r--r--TAO/tao/Special_Basic_Argument_T.cpp12
-rw-r--r--TAO/tao/Special_Basic_Argument_T.h4
-rw-r--r--TAO/tao/Special_Basic_Argument_T.inl3
-rw-r--r--TAO/tao/Special_Basic_Arguments.h11
-rw-r--r--TAO/tao/Stub.cpp2
-rw-r--r--TAO/tao/Stub.h4
-rw-r--r--TAO/tao/Stub.i4
-rw-r--r--TAO/tao/Synch_Invocation.cpp4
-rw-r--r--TAO/tao/Synch_Invocation.h6
-rw-r--r--TAO/tao/Synch_Invocation.inl6
-rw-r--r--TAO/tao/Synch_Queued_Message.cpp14
-rw-r--r--TAO/tao/Synch_Queued_Message.h4
-rw-r--r--TAO/tao/Synch_Reply_Dispatcher.cpp4
-rw-r--r--TAO/tao/Synch_Reply_Dispatcher.h9
-rw-r--r--TAO/tao/SystemException.cpp7
-rw-r--r--TAO/tao/SystemException.h3
-rw-r--r--TAO/tao/SystemException.inl4
-rw-r--r--TAO/tao/TAO_Internal.cpp5
-rw-r--r--TAO/tao/TAO_Server_Request.cpp6
-rw-r--r--TAO/tao/TAO_Server_Request.h10
-rw-r--r--TAO/tao/TAO_Server_Request.i4
-rw-r--r--TAO/tao/TAO_Singleton.cpp6
-rw-r--r--TAO/tao/TAO_Singleton.h4
-rw-r--r--TAO/tao/TAO_Singleton.inl6
-rw-r--r--TAO/tao/TAO_Singleton_Manager.cpp6
-rw-r--r--TAO/tao/TAO_Singleton_Manager.h28
-rw-r--r--TAO/tao/TAO_Singleton_Manager.inl10
-rw-r--r--TAO/tao/TSS_Resources.cpp4
-rw-r--r--TAO/tao/TSS_Resources.h4
-rw-r--r--TAO/tao/Tagged_Components.cpp4
-rw-r--r--TAO/tao/Tagged_Components.h7
-rw-r--r--TAO/tao/Tagged_Components.i4
-rw-r--r--TAO/tao/Tagged_Profile.cpp4
-rw-r--r--TAO/tao/Tagged_Profile.h5
-rw-r--r--TAO/tao/Tagged_Profile.i6
-rw-r--r--TAO/tao/Thread_Lane_Resources.cpp5
-rw-r--r--TAO/tao/Thread_Lane_Resources.h5
-rw-r--r--TAO/tao/Thread_Lane_Resources_Manager.cpp3
-rw-r--r--TAO/tao/Thread_Per_Connection_Handler.cpp4
-rw-r--r--TAO/tao/Thread_Per_Connection_Handler.h7
-rw-r--r--TAO/tao/TkResource_Factory.cpp8
-rw-r--r--TAO/tao/TkResource_Factory.h5
-rw-r--r--TAO/tao/TkResource_Loader.cpp9
-rw-r--r--TAO/tao/TkResource_Loader.h15
-rw-r--r--TAO/tao/Transport.cpp4
-rw-r--r--TAO/tao/Transport.h7
-rw-r--r--TAO/tao/Transport.inl5
-rw-r--r--TAO/tao/Transport_Acceptor.cpp7
-rw-r--r--TAO/tao/Transport_Acceptor.h7
-rw-r--r--TAO/tao/Transport_Acceptor.inl6
-rw-r--r--TAO/tao/Transport_Cache_Manager.cpp6
-rw-r--r--TAO/tao/Transport_Cache_Manager.h10
-rw-r--r--TAO/tao/Transport_Cache_Manager.inl9
-rw-r--r--TAO/tao/Transport_Connector.cpp7
-rw-r--r--TAO/tao/Transport_Connector.h7
-rw-r--r--TAO/tao/Transport_Connector.inl6
-rw-r--r--TAO/tao/Transport_Descriptor_Interface.cpp8
-rw-r--r--TAO/tao/Transport_Descriptor_Interface.h4
-rw-r--r--TAO/tao/Transport_Descriptor_Interface.inl27
-rw-r--r--TAO/tao/Transport_Mux_Strategy.cpp5
-rw-r--r--TAO/tao/Transport_Mux_Strategy.h7
-rw-r--r--TAO/tao/Transport_Queueing_Strategies.cpp5
-rw-r--r--TAO/tao/Transport_Queueing_Strategies.h7
-rw-r--r--TAO/tao/Transport_Timer.cpp5
-rw-r--r--TAO/tao/Transport_Timer.h7
-rw-r--r--TAO/tao/TypeCodeFactory_Adapter.h4
-rw-r--r--TAO/tao/UB_String_Argument_T.cpp12
-rw-r--r--TAO/tao/UB_String_Argument_T.h7
-rw-r--r--TAO/tao/UB_String_Argument_T.inl8
-rw-r--r--TAO/tao/UB_String_Arguments.h6
-rw-r--r--TAO/tao/UserException.cpp4
-rw-r--r--TAO/tao/UserException.h4
-rw-r--r--TAO/tao/UserException.inl4
-rw-r--r--TAO/tao/Valuetype_Adapter.cpp5
-rw-r--r--TAO/tao/Valuetype_Adapter.h6
-rw-r--r--TAO/tao/VarOut_T.cpp94
-rw-r--r--TAO/tao/VarOut_T.h3
-rw-r--r--TAO/tao/VarOut_T.inl7
-rw-r--r--TAO/tao/Var_Array_Argument_T.cpp12
-rw-r--r--TAO/tao/Var_Array_Argument_T.h4
-rw-r--r--TAO/tao/Var_Array_Argument_T.inl4
-rw-r--r--TAO/tao/Var_Size_Argument_T.cpp12
-rw-r--r--TAO/tao/Var_Size_Argument_T.h4
-rw-r--r--TAO/tao/Var_Size_Argument_T.inl3
-rw-r--r--TAO/tao/Wait_On_LF_No_Upcall.cpp4
-rw-r--r--TAO/tao/Wait_On_LF_No_Upcall.h10
-rw-r--r--TAO/tao/Wait_On_Leader_Follower.cpp4
-rw-r--r--TAO/tao/Wait_On_Leader_Follower.h6
-rw-r--r--TAO/tao/Wait_On_Reactor.cpp4
-rw-r--r--TAO/tao/Wait_On_Reactor.h6
-rw-r--r--TAO/tao/Wait_On_Read.cpp4
-rw-r--r--TAO/tao/Wait_On_Read.h4
-rw-r--r--TAO/tao/Wait_Strategy.cpp5
-rw-r--r--TAO/tao/Wait_Strategy.h7
-rw-r--r--TAO/tao/default_resource.h3
-rw-r--r--TAO/tao/params.cpp4
-rw-r--r--TAO/tao/params.h9
-rw-r--r--TAO/tao/params.i4
-rw-r--r--TAO/tao/varbase.h8
212 files changed, 1133 insertions, 464 deletions
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 6c3ddf97b79..776ba261bbe 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -27,11 +27,11 @@
#include "tao/Exception.h"
#include "tao/params.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward declarations.
class ACE_Addr;
class ACE_Reactor;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_Acceptor;
class TAO_Acceptor_Filter;
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index cea5b8de1cb..fc1840178b0 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -25,15 +25,15 @@
#include "tao/IOP_IORC.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Pluggable_Reply_Params;
-class TAO_ORB_Core ;
class ACE_Time_Value;
-class TAO_Transport;
class ACE_Lock;
class ACE_Allocator;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Pluggable_Reply_Params;
+class TAO_ORB_Core;
+class TAO_Transport;
/**
* @class TAO_Asynch_Reply_Dispatcher_Base
*
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index 86bd88b3b1c..d83b0c542e9 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -27,9 +27,10 @@
#include "ace/Service_Object.h"
+class ACE_Lock;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
class TAO_Transport_Mux_Strategy;
class TAO_Wait_Strategy;
class TAO_Transport;
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index 20c6bafe044..772fc1c8e75 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -25,10 +25,10 @@
#include "tao/CONV_FRAMEC.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
class ACE_WChar_Codeset_Translator;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Profile;
class TAO_Transport;
class TAO_Operation_Details;
diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h
index 4b2e50d2b86..6e1b071fa01 100644
--- a/TAO/tao/Codeset_Translator_Base.h
+++ b/TAO/tao/Codeset_Translator_Base.h
@@ -25,15 +25,14 @@
#include "tao/Codeset_Translator_Base.h"
#include "ace/Service_Object.h"
+class ACE_Char_Codeset_Translator;
+class ACE_WChar_Codeset_Translator;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_InputCDR;
class TAO_OutputCDR;
-class ACE_Char_Codeset_Translator;
-class ACE_WChar_Codeset_Translator;
-
-
// ****************************************************************
/**
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index 7724a113b75..a7eed8c3df3 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -24,10 +24,10 @@
#include "ace/Condition_T.h"
#include "ace/Global_Macros.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
class ACE_Time_Value;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Condition
*
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
index d80b23b5ff2..97ba8b87066 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -23,14 +23,15 @@
#include "tao/Versioned_Namespace.h"
+class ACE_Synch_Options;
+class ACE_Time_Value;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_ORB_Core;
class TAO_Connector;
class TAO_Connection_Handler;
class TAO_Transport;
-class ACE_Synch_Options;
-class ACE_Time_Value;
/**
* @class TAO_Connect_Strategy
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 20138327665..2ff6a96c82e 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -23,13 +23,14 @@
#include "tao/Basic_Types.h"
+class ACE_SOCK;
+class ACE_Lock;
+class ACE_Event_Handler;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_ORB_Core;
class TAO_Transport;
-class ACE_SOCK;
-class ACE_Lock;
-class ACE_Event_Handler;
/*
* Hook to specialize the connection handler with the
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index 248be2daf3a..8ad9f41fcd8 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -22,10 +22,11 @@
#include "tao/Basic_Types.h"
+class ACE_Thread_Manager;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_ORB_Core;
-class ACE_Thread_Manager;
/**
* @class TAO_Connect_Creation_Strategy
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 6482777f9ce..bd07824a27a 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -39,10 +39,10 @@
#include "ace/iosfwd.h"
#include "ace/CORBA_macros.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
class ACE_Allocator;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_OutputCDR;
class TAO_InputCDR;
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
index 09c532a17b9..e8877d04f23 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -28,12 +28,12 @@
#include "tao/Basic_Types.h"
#include "ace/SString.h"
+class ACE_Lock;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
class TAO_Service_Callbacks;
class TAO_ORB_Core;
-class ACE_Lock;
/**
* @class TAO_Fault_Tolerance_Service
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
index 646a83b67b7..ad351745d4d 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -21,9 +21,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+class ACE_Time_Value;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Time_Value;
class TAO_Transport;
class TAO_Queued_Message;
diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h
index 4a6e0bcdace..7cbb8c1bb71 100644
--- a/TAO/tao/GIOP_Utils.h
+++ b/TAO/tao/GIOP_Utils.h
@@ -27,10 +27,11 @@
#include "tao/IOP_IORC.h"
+class ACE_Time_Value;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Transport;
-class ACE_Time_Value;
/**
* All GIOP messages include a header and message type. Not
@@ -48,7 +49,7 @@ typedef enum GIOP_Messages
TAO_GIOP_CLOSECONNECTION = 5,
TAO_GIOP_MESSAGERROR = 6, // by both.
TAO_GIOP_FRAGMENT = 7 // by both.
-}TAO_GIOP_Message_Type;
+} TAO_GIOP_Message_Type;
typedef enum GIOP_LocateStatusType
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index 116e4a76293..8ee34e12976 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -13,21 +13,24 @@
#ifndef TAO_GUI_RESOURCE_FACTORY_H
#define TAO_GUI_RESOURCE_FACTORY_H
+
#include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
+
#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/orbconf.h"
+
+#include "ace/Thread_Mutex.h"
-//forwards
class ACE_Reactor_Impl;
class ACE_Reactor;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/** Abstract base class for the GUI resource factory.
@@ -91,4 +94,5 @@ namespace TAO
TAO_END_VERSIONED_NAMESPACE_DECL
#include /**/ "ace/post.h"
-#endif /*TAO_GUI_RESOURCE_FACTORY_H*/
+
+#endif /* TAO_GUI_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index f976305aaf3..a108c92130e 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -25,10 +25,10 @@
#include "tao/SystemException.h"
#include "tao/PI_ForwardC.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
template <class T> class ACE_Array_Base;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace PortableInterceptor
{
class IORInterceptor;
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index 14f498e4a70..e5414003137 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -22,10 +22,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+class ACE_Allocator;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-/// Forward declarations
-class ACE_Allocator;
class TAO_ORB_Core;
class TAO_Queued_Data;
class TAO_Transport;
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 70793b31da7..5cae0020013 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -29,12 +29,12 @@
#include "tao/CORBA_methods.h"
#include "tao/Pseudo_VarOut_T.h"
+class ACE_Time_Value;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Operation_Details;
class TAO_Stub;
-class ACE_Time_Value;
-
namespace CORBA
{
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index 4778f792a23..fed8b3426b5 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -28,11 +28,11 @@
#include "ace/CORBA_macros.h"
+class ACE_Time_Value;
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_MProfile;
-class ACE_Time_Value;
namespace TAO
{
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index 75c1ef7f605..33e071a5d7d 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -21,11 +21,12 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+class ACE_Time_Value;
+class ACE_Synch_Options;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Connector;
-class ACE_Time_Value;
-class ACE_Synch_Options;
/**
* @class TAO_LF_Connect_Strategy
diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h
index 7b7e5753ce5..2b0daf54ece 100644
--- a/TAO/tao/LF_Strategy.h
+++ b/TAO/tao/LF_Strategy.h
@@ -23,9 +23,10 @@
#include "tao/Versioned_Namespace.h"
+class ACE_Time_Value;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Time_Value;
class TAO_Leader_Follower;
/**
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index e878b794330..8c7eb2adb45 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -28,13 +28,13 @@
#include "ace/Intrusive_List_Node.h"
#include "ace/OS_NS_Thread.h"
+class ACE_Reactor;
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_LF_Event;
class TAO_Transport;
class TAO_ORB_Core;
-class ACE_Reactor;
class TAO_ORB_Core_TSS_Resources;
/**
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
index 5dccff7230f..dec5597f6e8 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -22,14 +22,14 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+
namespace CORBA
{
class Object;
typedef Object *Object_ptr;
}
-class ACE_Time_Value;
-
namespace TAO
{
/**
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 22db8c09315..19fee62636a 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -42,6 +42,7 @@
#include "ace/Lock_Adapter_T.h"
#include "ace/TSS_T.h"
+class ACE_Data_Block;
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -55,9 +56,6 @@ namespace TAO
#endif /* TAO_HAS_INTERCEPTORS == 1 */
-// Forward declarations
-class ACE_Data_Block;
-
class TAO_Adapter;
class TAO_Acceptor;
class TAO_Connector;
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 4b0fc06ce8f..c0710a24d6d 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -39,14 +39,14 @@
# undef IOR
#endif /* HPUX && IOR */
+class ACE_Lock;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Stub;
class TAO_Abstract_ServantBase;
class TAO_ORB_Core;
-class ACE_Lock;
-
namespace TAO
{
class ObjectKey;
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
index b1d2432c89a..1d873b9ae12 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
// $Id$
#include "tao/Parser_Registry.h"
@@ -15,6 +14,8 @@ ACE_RCSID (tao,
Parser_Registry,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Parser_Registry::TAO_Parser_Registry (void)
: parsers_ (0),
size_ (0)
@@ -73,3 +74,4 @@ TAO_Parser_Registry::match_parser (const char *ior_string)
return 0;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
index 13571c9bd2b..ce997817d8c 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -19,12 +19,17 @@
#include "tao/TAO_Export.h"
-#include "ace/os_include/os_stddef.h"
-
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/os_include/os_stddef.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Forward declarations.
class TAO_ORB_Core;
class TAO_IOR_Parser;
@@ -77,6 +82,8 @@ private:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined(__ACE_INLINE__)
#include "tao/Parser_Registry.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Parser_Registry.i b/TAO/tao/Parser_Registry.i
index 29aabd26ddc..5545cece0df 100644
--- a/TAO/tao/Parser_Registry.i
+++ b/TAO/tao/Parser_Registry.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE TAO_Parser_Registry::Parser_Iterator
TAO_Parser_Registry::begin (void) const
{
@@ -11,3 +15,5 @@ TAO_Parser_Registry::end (void) const
{
return this->parsers_ + this->size_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp
index c63880b3fa4..5754449b5ad 100644
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ b/TAO/tao/Pluggable_Messaging.cpp
@@ -6,7 +6,11 @@ ACE_RCSID (tao,
Pluggable_Messaging,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Pluggable_Messaging::~TAO_Pluggable_Messaging (void)
{
-
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index 86989c0865b..6520abad3a3 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -26,6 +26,10 @@
#include "tao/Basic_Types.h"
+class ACE_Time_Value;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace CORBA
{
class Exception;
@@ -40,8 +44,6 @@ class TAO_Target_Specification;
class TAO_OutputCDR;
class TAO_Queued_Data;
-class ACE_Time_Value;
-
// @@ The more I think I about this class, I feel that this class need
// not be a ABC as it is now. Instead we have these options
// (1) Parametrize this class with the "Messaging Object". Then the
@@ -178,6 +180,8 @@ public:
virtual TAO_OutputCDR &out_stream (void) = 0;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /*TAO_PLUGGABLE_MESSAGING_H*/
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index d7f79cecec5..3af1a6add70 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -12,10 +12,12 @@ ACE_RCSID (tao,
"$Id$")
-TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (
- TAO_Transport *t
- )
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t)
: input_cdr_ (0)
- , transport_ (t)
+ , transport_ (t)
{
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index 9a7b421ecbf..ea31e8cd8ca 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -24,6 +24,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Transport;
@@ -181,10 +182,12 @@ enum TAO_Pluggable_Message_Exception_Type
TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/Pluggable_Messaging_Utils.i"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
-#endif /*TAO_PLUGGABLE_MESSAGING_UTILS_H*/
+#endif /* TAO_PLUGGABLE_MESSAGING_UTILS_H */
diff --git a/TAO/tao/Pluggable_Messaging_Utils.i b/TAO/tao/Pluggable_Messaging_Utils.i
index 0aa88955e5d..7a10993036e 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.i
+++ b/TAO/tao/Pluggable_Messaging_Utils.i
@@ -2,6 +2,8 @@
//$Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
: svc_ctx_ (),
@@ -27,3 +29,5 @@ TAO_Pluggable_Reply_Params_Base::service_context_notowned (void)
{
return *this->service_context_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
index beec71d1266..ad639e4bf53 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
@@ -1,4 +1,4 @@
-//$Id$
+// $Id$
#include "PolicyFactory_Registry_Adapter.h"
@@ -8,9 +8,10 @@ ACE_RCSID (tao,
"$Id$")
-namespace TAO
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
{
- PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
- {
- }
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h
index 4cf50d7d7a9..586555523c0 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -21,8 +21,12 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/Basic_Types.h"
+
#include "ace/CORBA_macros.h"
-#include "Basic_Types.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//-- Forward Declarations--
namespace CORBA
@@ -83,6 +87,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_POLICY_FACTORY_REGISTRY_ADAPTER_H */
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index fc8cbb69227..2b3e49e8f14 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -10,16 +10,17 @@
# include "tao/Policy_Current.inl"
#endif /* ! __ACE_INLINE__ */
-
ACE_RCSID (tao,
Policy_Current,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Policy_Current_Impl &
TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
{
- TAO_TSS_Resources *tss =
+ TAO_TSS_Resources * const tss =
TAO_TSS_Resources::instance ();
TAO_Policy_Current_Impl *old = tss->policy_current_;
@@ -77,4 +78,6 @@ TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type
ACE_ENV_ARG_PARAMETER);
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index ad0d5da00e3..677b400cc66 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -19,14 +19,12 @@
#include /**/ "ace/pre.h"
-#include "TAO_Export.h"
+#include "tao/orbconf.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/orbconf.h"
-
#if (TAO_HAS_CORBA_MESSAGING == 1)
#include "tao/PolicyC.h"
@@ -39,9 +37,9 @@
class TAO_Policy_Current_Impl;
-class TAO_Export TAO_Policy_Current :
- public CORBA::PolicyCurrent,
- public TAO_Local_RefCounted_Object
+class TAO_Policy_Current
+ : public CORBA::PolicyCurrent
+ , public TAO_Local_RefCounted_Object
{
public:
/// Constructor
diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl
index e9bdbec8bb8..3605ebd5b7e 100644
--- a/TAO/tao/Policy_Current.inl
+++ b/TAO/tao/Policy_Current.inl
@@ -1,7 +1,12 @@
+// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Policy_Current::TAO_Policy_Current (void)
{
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp
index 6ebb543218d..9ac3585bd8a 100644
--- a/TAO/tao/Policy_Current_Impl.cpp
+++ b/TAO/tao/Policy_Current_Impl.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
Policy_Manager,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
void
TAO_Policy_Current_Impl::set_policy_overrides (
const CORBA::PolicyList & policies,
@@ -35,4 +37,6 @@ TAO_Policy_Current_Impl::get_policy_overrides (
ACE_ENV_ARG_PARAMETER);
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h
index 300473723ac..fd95008a237 100644
--- a/TAO/tao/Policy_Current_Impl.h
+++ b/TAO/tao/Policy_Current_Impl.h
@@ -38,7 +38,9 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
-class TAO_Export TAO_Policy_Current_Impl
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Policy_Current_Impl
{
public:
@@ -67,6 +69,8 @@ private:
TAO_Policy_Set manager_impl_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl
index 92838269eec..c7cc06d9743 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
: manager_impl_ (TAO_POLICY_THREAD_SCOPE)
@@ -22,3 +26,4 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type
ACE_ENV_ARG_PARAMETER);
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 383c7a44db9..6b1ada9329e 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -13,6 +13,7 @@ ACE_RCSID (tao,
Policy_Manager,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CORBA::PolicyList *
TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
@@ -34,4 +35,6 @@ TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index c61e90afdb9..14c00ee8721 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -36,10 +36,11 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-class TAO_Export TAO_Policy_Manager :
- public CORBA::PolicyManager,
- public TAO_Local_RefCounted_Object
+class TAO_Policy_Manager
+ : public CORBA::PolicyManager
+ , public TAO_Local_RefCounted_Object
{
public:
/// constructor
@@ -75,6 +76,8 @@ private:
TAO_Policy_Set impl_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index 32eb06bdff8..b982fad4f14 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Policy_Manager::TAO_Policy_Manager (void)
: impl_ (TAO_POLICY_ORB_SCOPE)
@@ -32,3 +34,5 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
return this->impl_.get_cached_policy (type
ACE_ENV_ARG_PARAMETER);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 9739eabc2bc..e7425362b9b 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -15,6 +15,15 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
+ : scope_ (scope)
+{
+ for (unsigned int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i)
+ this->cached_policies_[i] = 0;
+}
+
TAO_Policy_Set::~TAO_Policy_Set (void)
{
ACE_DECLARE_NEW_CORBA_ENV;
@@ -367,3 +376,5 @@ TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
return CORBA::Policy::_nil ();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 0e3b8e6bc24..db5bc837520 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -26,6 +26,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Policy_Set
*
@@ -44,6 +46,7 @@ public:
*/
TAO_Policy_Set (TAO_Policy_Scope scope);
+ /// Copy constructor.
TAO_Policy_Set (const TAO_Policy_Set &rhs);
/// Destructor
@@ -101,7 +104,7 @@ public:
CORBA::ULong num_policies (void) const;
private:
- ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&))
+ TAO_Policy_Set & operator= (const TAO_Policy_Set&);
/// Remove and destroy all the policy objects owned by this policy
/// manager.
@@ -122,6 +125,7 @@ private:
TAO_Policy_Scope scope_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
# include "tao/Policy_Set.i"
diff --git a/TAO/tao/Policy_Set.i b/TAO/tao/Policy_Set.i
index 11c35bfdaa8..a8767177029 100644
--- a/TAO/tao/Policy_Set.i
+++ b/TAO/tao/Policy_Set.i
@@ -1,17 +1,15 @@
+// -*- C++ -*-
+//
// $Id$
-ACE_INLINE
-TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
- : scope_ (scope)
-{
- for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; i++)
- this->cached_policies_[i] = 0;
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
TAO_Policy_Set::compatible_scope (TAO_Policy_Scope policy_scope) const
{
- return (((unsigned int) policy_scope & (unsigned int) this->scope_) > 0);
+ return
+ ((static_cast<unsigned int> (policy_scope)
+ & static_cast<unsigned int> (this->scope_)) > 0);
}
ACE_INLINE CORBA::Policy *
@@ -25,3 +23,5 @@ TAO_Policy_Set::num_policies (void) const
{
return this->policy_list_.length();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index cd51a8a1426..ef3aa9f0494 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -10,19 +10,18 @@ ACE_RCSID (tao,
Policy_Validator,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core)
: orb_core_ (orb_core),
next_ (0)
{
- // No-Op.
}
TAO_Policy_Validator::~TAO_Policy_Validator (void)
{
- if (this->next_)
- {
- delete this->next_;
- }
+ delete this->next_;
}
TAO_ORB_Core &
@@ -87,7 +86,7 @@ TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- if (this->next_ != 0)
+ if (this->next_)
{
this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -101,3 +100,5 @@ TAO_Policy_Validator::legal_policy (CORBA::PolicyType type)
|| ((this->next_ != 0)
&& this->next_->legal_policy_impl (type)));
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index 10defec9d00..69d680d9e61 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
//=============================================================================
/**
* @file Policy_Validator.h
@@ -25,6 +27,8 @@
#include "tao/TAO_Export.h"
#include "tao/Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Forward declarations.
class TAO_Policy_Set;
class TAO_ORB_Core;
@@ -109,6 +113,8 @@ private:
TAO_Policy_Validator *next_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
-#endif /* TAO_POLICY_VALIDATOR_H_ */
+#endif /* TAO_POLICY_VALIDATOR_H */
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index 048c289c0e5..31fde2cb144 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -15,6 +15,9 @@ ACE_RCSID (tao,
Principal,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
CORBA::Principal::Principal (void)
: refcount_ (1)
{
@@ -61,3 +64,4 @@ operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x)
return (CORBA::Boolean) cdr.good_bit ();
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 4010df0a507..e216328dcc2 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -18,16 +18,20 @@
#define TAO_PRINCIPAL_H
#include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
+
+#include "CORBA_methods.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/Atomic_Op.h"
#include "OctetSeqC.h"
#include "Pseudo_VarOut_T.h"
-#include "CORBA_methods.h"
+
+#include "ace/Thread_Mutex.h"
+#include "ace/Atomic_Op.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace CORBA
{
@@ -100,6 +104,8 @@ operator<< (TAO_OutputCDR &, CORBA::Principal *);
TAO_Export CORBA::Boolean
operator>> (TAO_InputCDR &, CORBA::Principal *&);
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Principal.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i
index 559ddb82db0..5c7ef0d666a 100644
--- a/TAO/tao/Principal.i
+++ b/TAO/tao/Principal.i
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
CORBA::Boolean
CORBA::is_nil (CORBA::Principal_ptr principal)
@@ -59,3 +61,4 @@ CORBA::Principal::_nil (void)
return 0;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 2018bad30ab..f22f0176bb7 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -26,6 +26,9 @@ ACE_RCSID (tao,
// ****************************************************************
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Profile::TAO_Profile (CORBA::ULong tag,
TAO_ORB_Core *orb_core,
const TAO::ObjectKey &obj_key,
@@ -948,3 +951,5 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
return (CORBA::Boolean) cdr.good_bit ();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index a19068df002..69caa507680 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -26,6 +26,9 @@
#include "tao/Service_Callbacks.h"
class ACE_Lock;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_MProfile;
class TAO_Stub;
class TAO_Endpoint;
@@ -415,6 +418,8 @@ private:
//@@ TAO_PROFILE_SPL_EXTERN_HOOK
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Profile.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i
index dde1611c1da..4cbbee30eb3 100644
--- a/TAO/tao/Profile.i
+++ b/TAO/tao/Profile.i
@@ -1,6 +1,9 @@
// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE CORBA::ULong
TAO_Profile::tag (void) const
{
@@ -60,3 +63,5 @@ TAO_Profile::object_key (void) const
{
return this->ref_object_key_->object_key ();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 8c88d2a7db0..cfb4a898e86 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -23,6 +23,8 @@ ACE_RCSID (tao,
Profile_Transport_Resolver,
"$Id$")
+
+
namespace TAO
{
@@ -216,3 +218,5 @@ namespace TAO
CORBA::COMPLETED_NO));
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 0dd849a04a5..d62171b8d91 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -25,11 +25,14 @@
#include "tao/SystemException.h"
+class ACE_Time_Value;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Stub;
class TAO_Profile;
class TAO_Transport;
class TAO_Endpoint;
-class ACE_Time_Value;
class TAO_Transport_Descriptor_Interface;
namespace CORBA
@@ -181,6 +184,8 @@ namespace TAO
};
} // TAO namespace end
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Profile_Transport_Resolver.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 2f35fa34c5b..3617d71e3da 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -1,5 +1,10 @@
// -*- C++ -*-
+//
// $Id$
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
ACE_INLINE
@@ -8,12 +13,12 @@ namespace TAO
TAO_Stub *stub,
bool block)
: obj_ (p)
- , stub_ (stub)
- , transport_ (0)
- , profile_ (0)
- , inconsistent_policies_ (0)
- , is_released_ (false)
- , blocked_ (block)
+ , stub_ (stub)
+ , transport_ (0)
+ , profile_ (0)
+ , inconsistent_policies_ (0)
+ , is_released_ (false)
+ , blocked_ (block)
{
}
@@ -67,3 +72,5 @@ namespace TAO
return tmp;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
index 604e01bf55e..4b02516a37c 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (tao,
Protocols_Hooks,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
: send_buffer_size_ (0),
recv_buffer_size_ (0),
@@ -50,8 +52,8 @@ TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void)
{
}
-/// destructor
TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void)
{
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index c176aa2bc44..dc1a30c0ae8 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -27,6 +27,9 @@
#include "IOP_IORC.h"
#include "ace/SString.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace CORBA
{
class Policy;
@@ -200,6 +203,8 @@ public:
//@}
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/Pseudo_VarOut_T.cpp b/TAO/tao/Pseudo_VarOut_T.cpp
index 5d0a9ebc3cd..9d325bfb89a 100644
--- a/TAO/tao/Pseudo_VarOut_T.cpp
+++ b/TAO/tao/Pseudo_VarOut_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_PSEUDO_VAROUT_T_C
-#define TAO_PSEUDO_VAROUT_T_C
+#ifndef TAO_PSEUDO_VAROUT_T_CPP
+#define TAO_PSEUDO_VAROUT_T_CPP
#include "tao/Pseudo_VarOut_T.h"
@@ -9,9 +9,7 @@
#include "tao/Pseudo_VarOut_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- Pseudo_VarOut_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename T>
TAO_Pseudo_Var_T<T> &
@@ -25,4 +23,7 @@ TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p)
return *this;
}
-#endif /* TAO_PSEUDO_VAROUT_T_C */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_PSEUDO_VAROUT_T_CPP */
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 4d73bba0c55..431e464d079 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -42,6 +42,8 @@
#include "tao/varbase.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Pseudo_Var_T
*
@@ -125,6 +127,8 @@ private:
TAO_Pseudo_Out_T<T,T_var> & operator= (const T_var &);
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/Pseudo_VarOut_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
index 7baddc74b88..8e5867beac6 100644
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
template <typename T>
ACE_INLINE
TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void)
@@ -171,3 +173,5 @@ TAO_Pseudo_Out_T<T,T_var>::operator-> (void)
{
return this->ptr_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource_Factory.cpp
index 561fffca095..0b890eadcb5 100644
--- a/TAO/tao/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource_Factory.cpp
@@ -4,13 +4,14 @@
#include "debug.h"
#include "ace/QtReactor.h"
-ACE_RCSID( TAO_QtResource,
+ACE_RCSID (TAO_QtResource,
QtResource_Factory,
"$Id$");
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
-
QtResource_Factory::QtResource_Factory (QApplication *qapp)
: reactor_impl_ (0)
, qapp_ (qapp)
@@ -43,3 +44,5 @@ namespace TAO
return this->reactor_impl_;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Factory.h b/TAO/tao/QtResource_Factory.h
index 83e37e7a3af..ba922a44480 100644
--- a/TAO/tao/QtResource_Factory.h
+++ b/TAO/tao/QtResource_Factory.h
@@ -24,9 +24,10 @@
#include "ace/QtReactor.h"
#include "tao/GUIResource_Factory.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
-
/**
* @class QtResource_Factory
*
@@ -61,5 +62,7 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_QTRESOURCE_FACTORY_H */
diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource_Loader.cpp
index 70fdae3053c..b526f248e33 100644
--- a/TAO/tao/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource_Loader.cpp
@@ -7,6 +7,8 @@ ACE_RCSID( TAO_QtResource,
QtResource_Loader,
"$Id$");
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
QtResource_Loader::QtResource_Loader (QApplication *qapp)
@@ -23,3 +25,5 @@ namespace TAO
{
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h
index 14a2e6d84b6..212f2b51795 100644
--- a/TAO/tao/QtResource_Loader.h
+++ b/TAO/tao/QtResource_Loader.h
@@ -21,8 +21,12 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/Versioned_Namespace.h"
+
#include <qapplication.h>
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -43,10 +47,12 @@ namespace TAO
class TAO_QtResource_Export QtResource_Loader
{
public:
- QtResource_Loader (QApplication *qapp);
-
+ QtResource_Loader (QApplication *qapp);
virtual ~QtResource_Loader (void);
};
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_QTRESOURCE_LOADER_H */
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
index 0839bda6455..93eb53bda9e 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
// $Id$
#include "Queued_Message.h"
@@ -7,6 +6,9 @@ ACE_RCSID (tao,
Queued_Message,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc,
ACE_Allocator *alloc,
int is_heap_allocated)
@@ -97,3 +99,5 @@ TAO_Queued_Message::push_front (TAO_Queued_Message *&head,
this->prev_ = 0;
head = this;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index c078f01d6b5..29c28df9efb 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -25,6 +25,9 @@
struct iovec;
class ACE_Message_Block;
class ACE_Allocator;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
/**
@@ -213,6 +216,8 @@ private:
TAO_Queued_Message *prev_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index 74bddc34ee6..5d8bf92dd1d 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -10,6 +10,9 @@ ACE_RCSID(tao,
Reactive_Connect_Strategy,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy (
TAO_ORB_Core *orb_core)
: TAO_Connect_Strategy (orb_core)
@@ -89,7 +92,6 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch,
return result;
}
-
int
TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
ACE_Time_Value *val)
@@ -100,3 +102,5 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
return this->wait (t->connection_handler (),
val);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
index 5550e00380d..c0c2a41dee7 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -15,16 +15,19 @@
#include /**/ "ace/pre.h"
-#include "Connect_Strategy.h"
+#include "tao/Connect_Strategy.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-class TAO_Connector;
class ACE_Time_Value;
class ACE_Synch_Options;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Connector;
+
/**
* @class TAO_Reactive_Connect_Strategy
*
@@ -57,6 +60,8 @@ public:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
-#endif /*TAO_REACTIVE_CONNECT_STRATEGY_H*/
+#endif /* TAO_REACTIVE_CONNECT_STRATEGY_H */
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 15761dbcb14..00ed6f9d756 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -10,6 +10,9 @@ ACE_RCSID (tao,
Reactive_Flushing_Strategy,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
int
TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport)
{
@@ -76,3 +79,5 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
return 0;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h
index 27041a0be5a..302f7bf7140 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.h
+++ b/TAO/tao/Reactive_Flushing_Strategy.h
@@ -21,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Reactive_Flushing_Strategy
*
@@ -37,6 +39,8 @@ public:
virtual int flush_transport (TAO_Transport *transport);
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_REACTIVE_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp
index 7bafb1bc50b..eb6ae666920 100644
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ b/TAO/tao/Refcounted_ObjectKey.cpp
@@ -10,6 +10,9 @@ ACE_RCSID(tao,
Refcounted_ObjectKey,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key)
: object_key_ (key)
, ref_count_ (1)
@@ -34,3 +37,5 @@ TAO::Refcounted_ObjectKey::decr_refcount (void)
return 0;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h
index 297ec6fd654..aac418c4b6f 100644
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ b/TAO/tao/Refcounted_ObjectKey.h
@@ -23,6 +23,8 @@
#include "tao/Object_KeyC.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -63,6 +65,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "Refcounted_ObjectKey.inl"
#endif /* defined INLINE */
diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl
index c829e6b45b0..be9f8f8496d 100644
--- a/TAO/tao/Refcounted_ObjectKey.inl
+++ b/TAO/tao/Refcounted_ObjectKey.inl
@@ -1,15 +1,20 @@
// -*- C++ -*-
+//
// $Id$
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE long
TAO::Refcounted_ObjectKey::incr_refcount (void)
{
return ++this->ref_count_;
}
-
-
ACE_INLINE const TAO::ObjectKey &
TAO::Refcounted_ObjectKey::object_key (void) const
{
return this->object_key_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index c19332acb84..aae02a33237 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
Remote_Invocation,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
Remote_Invocation::Remote_Invocation (
@@ -200,3 +202,5 @@ namespace TAO
return TAO_INVOKE_SUCCESS;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h
index 555d198afa7..9bb187a3ea8 100644
--- a/TAO/tao/Remote_Invocation.h
+++ b/TAO/tao/Remote_Invocation.h
@@ -23,6 +23,8 @@
#include "tao/Invocation_Base.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Operation_Details;
class TAO_Target_Specification;
class TAO_OutputCDR;
@@ -93,6 +95,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /*TAO_REMOTE_INVOCATION_H*/
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index 3ec43f69ed7..eb4d06eabde 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -13,6 +13,9 @@ ACE_RCSID (tao,
Remote_Object_Proxy_Broker,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
CORBA::Boolean
@@ -145,3 +148,5 @@ the_tao_remote_object_proxy_broker (void)
static TAO::Remote_Object_Proxy_Broker the_broker;
return &the_broker;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index 9541b56abdb..eab7f29e5b7 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -26,6 +26,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -71,6 +73,8 @@ namespace TAO
TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker (void);
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_REMOTE_OBJECT_PROXY_BROKER_H */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 9f8146c7bd7..eeec0b8072b 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (tao,
#include "tao/Reply_Dispatcher.i"
#endif /* __ACE_INLINE__ */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Constructor.
TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
// Just an invalid reply status.
@@ -21,3 +23,5 @@ TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
{
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 63cd7683422..4f4c16e879b 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.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"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Forward Declarations.
class TAO_GIOP_Message_State;
class TAO_GIOP_Message_Version;
@@ -87,6 +89,8 @@ protected:
CORBA::ULong reply_status_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/Reply_Dispatcher.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i
index 549263801ff..e390ec5911c 100644
--- a/TAO/tao/Reply_Dispatcher.i
+++ b/TAO/tao/Reply_Dispatcher.i
@@ -1,7 +1,14 @@
+// -*- C++ -*-
+//
// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE CORBA::ULong
TAO_Reply_Dispatcher::reply_status (void) const
{
return this->reply_status_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index 4e1d483a6c3..2f4abca0ceb 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (tao,
Request_Dispatcher,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
{
}
@@ -25,3 +27,5 @@ TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index 0c6ebba06f3..a06f4462c6b 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -28,6 +28,8 @@
#include "tao/Pseudo_VarOut_T.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_ServerRequest;
@@ -59,6 +61,8 @@ public:
ACE_ENV_ARG_DECL);
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_REQUEST_DISPATCHER_H */
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 139549d5440..cd66fb6808b 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -29,6 +29,7 @@
#include "ace/SString.h"
#include "ace/CDR_Base.h"
+class ACE_Lock;
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -41,8 +42,6 @@ class TAO_Connection_Purging_Strategy;
class TAO_LF_Strategy;
class TAO_Codeset_Manager;
-class ACE_Lock;
-
// ****************************************************************
class TAO_Export TAO_Protocol_Item
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 836e592e6a1..0f220dbdb06 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -11,6 +11,9 @@ ACE_RCSID (tao,
Resume_Handle,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
void
TAO_Resume_Handle::resume_handle (void)
{
@@ -27,3 +30,5 @@ TAO_Resume_Handle::resume_handle (void)
// Set the flag, so that we dont resume again..
this->flag_ = TAO_HANDLE_ALREADY_RESUMED;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h
index 44aed27e266..c7eed3e401a 100644
--- a/TAO/tao/Resume_Handle.h
+++ b/TAO/tao/Resume_Handle.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;
/**
@@ -82,6 +86,8 @@ private:
TAO_Handle_Resume_Flag flag_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Resume_Handle.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
index 38aae6740f1..e89466fd4e2 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -1,6 +1,9 @@
// -*- C++ -*-
+//
//$Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core,
ACE_HANDLE h)
@@ -15,9 +18,6 @@ TAO_Resume_Handle::~TAO_Resume_Handle (void)
{
if (this->flag_ == TAO_HANDLE_RESUMABLE)
this->resume_handle ();
-
- this->orb_core_ = 0;
- this->handle_ = ACE_INVALID_HANDLE;
}
@@ -36,3 +36,5 @@ TAO_Resume_Handle::operator= (const TAO_Resume_Handle &rhs)
return *this;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp
index 89b13ea1890..bb832224a9e 100644
--- a/TAO/tao/Seq_Out_T.cpp
+++ b/TAO/tao/Seq_Out_T.cpp
@@ -1,5 +1,7 @@
-#ifndef TAO_SEQ_OUT_T_C
-#define TAO_SEQ_OUT_T_C
+// $Id$
+
+#ifndef TAO_SEQ_OUT_T_CPP
+#define TAO_SEQ_OUT_T_CPP
#include "Seq_Out_T.h"
@@ -7,8 +9,4 @@
#include "Seq_Out_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- Sequence_Out_T,
- "$Id$")
-
-#endif /*TAO_SEQUENCE_OUT_T_C*/
+#endif /* TAO_SEQUENCE_OUT_T_CPP */
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
index 895c4f9b62b..1bc9d4ef17e 100644
--- a/TAO/tao/Seq_Out_T.h
+++ b/TAO/tao/Seq_Out_T.h
@@ -18,6 +18,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/**
* @class TAO_Seq_Out_T
@@ -82,6 +83,8 @@ private:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "Seq_Out_T.inl"
diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl
index c26815ff9cb..da3a0e8b95b 100644
--- a/TAO/tao/Seq_Out_T.inl
+++ b/TAO/tao/Seq_Out_T.inl
@@ -1,5 +1,9 @@
// -*- C++ -*-
+//
//$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
template<typename T, typename T_var, typename T_elem>
ACE_INLINE
TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T *& p)
@@ -152,3 +156,5 @@ TAO_MngSeq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
{
return this->ptr_->operator[] (index);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp
index 04d36e7dafa..e8e38e2eddb 100644
--- a/TAO/tao/Seq_Var_T.cpp
+++ b/TAO/tao/Seq_Var_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_SEQ_VAR_T_C
-#define TAO_SEQ_VAR_T_C
+#ifndef TAO_SEQ_VAR_T_CPP
+#define TAO_SEQ_VAR_T_CPP
#include "tao/Seq_Var_T.h"
@@ -9,26 +9,15 @@
#include "tao/Seq_Var_T.inl"
#endif /* __ACE_INLINE__ */
+#include "ace/OS_Memory.h"
-ACE_RCSID (tao,
- Seq_VarOut_T,
- "$Id$")
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T, typename T_elem>
TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (
- const TAO_Seq_Var_Base_T<T,T_elem> & p
- )
+ const TAO_Seq_Var_Base_T<T,T_elem> & p)
+ : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0)
{
- if (p.ptr_)
- {
- ACE_NEW (this->ptr_,
- T (*p.ptr_));
- }
- else
- {
- this->ptr_ = 0;
- }
}
// ****************************************************************************
@@ -36,34 +25,15 @@ TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (
template<typename T, typename T_elem>
TAO_FixedSeq_Var_T<T,T_elem> &
TAO_FixedSeq_Var_T<T,T_elem>::operator= (
- const TAO_FixedSeq_Var_T<T,T_elem> & p
- )
+ const TAO_FixedSeq_Var_T<T,T_elem> & p)
{
- if (this != &p)
- {
- if (p.ptr_ == 0)
- {
- delete this->ptr_;
- this->ptr_ = 0;
- }
- else
- {
- T * deep_copy = 0;
- ACE_NEW_RETURN (
- deep_copy,
- T (*p.ptr_),
- *this
- );
-
- if (deep_copy != 0)
- {
- T * tmp = deep_copy;
- deep_copy = this->ptr_;
- this->ptr_ = tmp;
- delete deep_copy;
- }
- }
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_FixedSeq_Var_T<T,T_elem> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
@@ -73,13 +43,13 @@ template<typename T, typename T_elem>
TAO_FixedSeq_Var_T<T,T_elem> &
TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p)
{
- if (this->ptr_ != &p)
- {
- delete this->ptr_;
- ACE_NEW_RETURN (this->ptr_,
- T (p),
- *this);
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_FixedSeq_Var_T<T,T_elem> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
@@ -88,35 +58,15 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p)
template<typename T, typename T_elem>
TAO_VarSeq_Var_T<T,T_elem> &
-TAO_VarSeq_Var_T<T,T_elem>::operator= (
- const TAO_VarSeq_Var_T<T,T_elem> & p
- )
+TAO_VarSeq_Var_T<T,T_elem>::operator= (const TAO_VarSeq_Var_T<T,T_elem> & p)
{
- if (this != &p)
- {
- if (p.ptr_ == 0)
- {
- delete this->ptr_;
- this->ptr_ = 0;
- }
- else
- {
- T * deep_copy = 0;
- ACE_NEW_RETURN (
- deep_copy,
- T (*p.ptr_),
- *this
- );
-
- if (deep_copy != 0)
- {
- T * tmp = deep_copy;
- deep_copy = this->ptr_;
- this->ptr_ = tmp;
- delete deep_copy;
- }
- }
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_VarSeq_Var_T<T,T_elem> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
@@ -129,33 +79,17 @@ TAO_MngSeq_Var_T<T,T_elem>::operator= (
const TAO_MngSeq_Var_T<T,T_elem> & p
)
{
- if (this != &p)
- {
- if (p.ptr_ == 0)
- {
- delete this->ptr_;
- this->ptr_ = 0;
- }
- else
- {
- T * deep_copy = 0;
- ACE_NEW_RETURN (
- deep_copy,
- T (*p.ptr_),
- *this
- );
-
- if (deep_copy != 0)
- {
- T * tmp = deep_copy;
- deep_copy = this->ptr_;
- this->ptr_ = tmp;
- delete deep_copy;
- }
- }
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_MngSeq_Var_T<T,T_elem> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
-#endif /* TAO_SEQ_VAR_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_SEQ_VAR_T_CPP */
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
index c5c401f8f5b..02b3d848f13 100644
--- a/TAO/tao/Seq_Var_T.h
+++ b/TAO/tao/Seq_Var_T.h
@@ -19,7 +19,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/OS_Memory.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/**
* @class TAO_Seq_Var_Base_T
@@ -139,7 +141,7 @@ public:
T_elem operator[] (CORBA::ULong index);
};
-
+TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
#include "Seq_Var_T.inl"
diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl
index b625dac9a6e..93d43fd480e 100644
--- a/TAO/tao/Seq_Var_T.inl
+++ b/TAO/tao/Seq_Var_T.inl
@@ -1,4 +1,8 @@
-//$Id$
+// -*- C++ -*-
+//
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T, typename T_elem>
ACE_INLINE
@@ -127,7 +131,7 @@ ACE_INLINE
TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (const T & p)
{
ACE_NEW (this->ptr_,
- T (p));
+ T (p));
}
template<typename T, typename T_elem>
@@ -153,20 +157,22 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
template<typename T, typename T_elem>
ACE_INLINE
TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (void)
-{}
+{
+}
template<typename T, typename T_elem>
ACE_INLINE
TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (T * p)
: TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
+{
+}
template<typename T, typename T_elem>
TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (
- const TAO_VarSeq_Var_T<T,T_elem> & p
- )
+ const TAO_VarSeq_Var_T<T,T_elem> & p)
: TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
+{
+}
template<typename T, typename T_elem>
ACE_INLINE
@@ -205,14 +211,15 @@ template<typename T, typename T_elem>
ACE_INLINE
TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (T * p)
: TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
+{
+}
template<typename T, typename T_elem>
TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (
- const TAO_MngSeq_Var_T<T,T_elem> & p
- )
+ const TAO_MngSeq_Var_T<T,T_elem> & p)
: TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
+{
+}
template<typename T, typename T_elem>
ACE_INLINE
@@ -239,3 +246,5 @@ TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
{
return this->ptr_->operator[] (index);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 50b11409ea4..138c46ab1c8 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -23,6 +23,8 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// *************************************************************
// Operations for class TAO_Base_Sequence
// *************************************************************
@@ -1110,3 +1112,5 @@ operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
{
return !(lhs == rhs);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index a0e39e1838b..1683a4da658 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -25,13 +25,15 @@
#include "tao/orbconf.h"
#include "tao/default_environment.h"
+class ACE_Message_Block;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace CORBA
{
class Object;
}
-class ACE_Message_Block;
-
/**
* @class TAO_Base_Sequence
*
@@ -657,6 +659,8 @@ TAO_Export bool operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
// ****************************************************************
+TAO_END_VERSIONED_NAMESPACE_DECL
+
/**
* @brief Safe assertions without including Log_Msg.h
*/
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
index 655bf0f4741..1293e10fe7b 100644
--- a/TAO/tao/Sequence.i
+++ b/TAO/tao/Sequence.i
@@ -1,8 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
// $Id$
// Operations on the unbounded sequence class.
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Base_Sequence::TAO_Base_Sequence (void)
: maximum_ (0),
@@ -295,3 +299,5 @@ TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
return this->mb_;
}
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 846f85ce84f..2d57569e8fd 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -1,10 +1,10 @@
// $Id$
-#ifndef TAO_SEQUENCE_T_C
-#define TAO_SEQUENCE_T_C
+#ifndef TAO_SEQUENCE_T_CPP
+#define TAO_SEQUENCE_T_CPP
-#include "Sequence_T.h"
-#include "Array_VarOut_T.h"
+#include "tao/Sequence_T.h"
+#include "tao/Array_VarOut_T.h"
#include "ace/OS_Memory.h"
@@ -14,9 +14,7 @@
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- Sequence_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename T>
TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
@@ -2158,4 +2156,6 @@ TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length,
this->release_ = release;
}
-#endif /* TAO_SEQUENCE_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* tao/TAO_SEQUENCE_T_CPP */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 1ef7c4f1c68..2f7964a06d0 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -23,6 +23,8 @@
#include "tao/Objref_VarOut_T.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Unbounded_Sequence
*
@@ -1203,6 +1205,8 @@ public:
CORBA::Boolean release = 0);
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
// *************************************************************
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index c1ecd508680..960c9ae687a 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -1,6 +1,9 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// ***************************************************
// Operations on the generic unbounded sequence class.
// ***************************************************
@@ -600,3 +603,5 @@ TAO_Bounded_WString_Sequence (CORBA::ULong length,
: TAO_Bounded_Base_Sequence (MAX, length, value, release)
{
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
index d92d818b480..c26fc486d27 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
@@ -4,11 +4,12 @@ ACE_RCSID (tao,
ServerRequestInterceptorAdapter,
"$Id$")
-namespace TAO
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void)
{
- ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void)
- {
- }
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 791ec6ca2f5..50126db4e1b 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -18,7 +18,7 @@
#include /**/ "ace/pre.h"
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -27,6 +27,9 @@
#include "ace/CORBA_macros.h"
#include "tao/SystemException.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace PortableInterceptor
{
class ServerRequestInterceptor;
@@ -158,9 +161,11 @@ namespace TAO
TAO_ServerRequest &server_request,
TAO::Upcall_Command &command
ACE_ENV_ARG_DECL) = 0;
-};
-
+ };
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_SERVER_REQUEST_INTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
index 3064718ded8..20f957007c8 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -4,7 +4,11 @@ ACE_RCSID (tao,
ServerRequestInterceptorAdapterFactory,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory (void)
{
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
index 592844d1405..e97987173d6 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -23,6 +23,9 @@
#include "tao/SystemException.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
class ServerRequestInterceptor_Adapter;
@@ -42,6 +45,8 @@ public:
virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_SERVERREQUESTINTERCEPTOR_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 504b67b6224..7b8c1f300c4 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -7,6 +7,9 @@ ACE_RCSID (tao,
Server_Strategy_Factory,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
: active_object_map_creation_parameters_ ()
{
@@ -71,3 +74,5 @@ TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Objec
use_active_hint_in_poa_names_ (1)
{
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 644dcf1f6d6..7d36997b180 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -24,6 +24,8 @@
#include "TAO_Export.h"
#include "Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
enum TAO_Demux_Strategy
@@ -128,6 +130,8 @@ protected:
Active_Object_Map_Creation_Parameters active_object_map_creation_parameters_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_SERVER_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index f4b6f228d3a..82311c96db7 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -8,6 +8,9 @@ ACE_RCSID (tao,
Service_Callbacks,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
{
}
@@ -83,3 +86,5 @@ TAO_Service_Callbacks::raise_transient_failure (
CORBA::COMPLETED_MAYBE),
TAO::TAO_INVOKE_FAILURE);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 8e68c9e15c1..d81e22fb3ca 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
//=============================================================================
/**
* @file Service_Callbacks.h
@@ -8,7 +10,6 @@
* of the default functionalities that the ORB provides by the
* services if they have been loaded in to the ORB_Core
*
- *
* @author Bala Natarajan <bala@cs.wustl.edu>
*/
//=============================================================================
@@ -27,6 +28,8 @@
#include "tao/Basic_Types.h"
#include "tao/Invocation_Utils.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Profile;
class TAO_MProfile;
class TAO_Stub;
@@ -110,6 +113,8 @@ public:
ACE_ENV_ARG_DECL);
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /*TAO_SERVICE_CALLBACK_H*/
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index b2708c3f4ce..9d0a4c1c5e6 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -1,6 +1,4 @@
-//
// $Id$
-//
#include "tao/Service_Context.h"
#include "tao/CDR.h"
@@ -15,6 +13,9 @@ ACE_RCSID (tao,
Service_Context,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
void
TAO_Service_Context::set_context_i (IOP::ServiceId id,
TAO_OutputCDR &cdr)
@@ -219,3 +220,5 @@ TAO_Service_Context::decode (TAO_InputCDR& cdr)
return 1;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
index b5ac3727b15..dcf9cebbc4c 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
// -*- C++ -*-
// ===================================================================
@@ -8,7 +7,6 @@
* $Id$
*
* @author Balachandran Natarajan <bala@cs.wustl.edu>
- *
*/
// ===================================================================
@@ -23,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
namespace CSD
@@ -150,6 +150,8 @@ private:
IOP::ServiceContextList service_context_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Service_Context.inl"
#endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
index d7540db80b7..1facf7680a7 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Service_Context::TAO_Service_Context (void)
: service_context_ ()
@@ -37,7 +39,6 @@ TAO_Service_Context::set_context (IOP::ServiceContext &context,
cdr);
}
-
ACE_INLINE int
TAO_Service_Context::is_service_id (IOP::ServiceId id)
{
@@ -52,3 +53,5 @@ TAO_Service_Context::is_service_id (IOP::ServiceId id)
}
return 0;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp
index bd5689dc202..22944bd9430 100644
--- a/TAO/tao/Services_Activate.cpp
+++ b/TAO/tao/Services_Activate.cpp
@@ -1,12 +1,13 @@
#include "tao/Services_Activate.h"
-#include "ace/Dynamic_Service.h"
ACE_RCSID (tao,
Services_Activate,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Services_Activate::~TAO_Services_Activate (void)
{
- //no-op
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index 582d6d3b94a..d1e1905d8f6 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
//=============================================================================
/**
* @file Services_Activate.h
@@ -7,7 +9,6 @@
* This is a generic interface that would be used to activate
* the services that are loaded through the svc.conf file
*
- *
* @author Bala Natarajan <bala@cs.wustl.edu>
*/
//=============================================================================
@@ -24,6 +25,8 @@
#include "tao/SystemException.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_Service_Callbacks;
@@ -54,6 +57,8 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /*TAO_SERVICES_ACTIVATE_H*/
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index ee973ea75ec..c4c8063b31b 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_C
-#define TAO_SPECIAL_BASIC_ARGUMENT_T_C
+#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
+#define TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
#include "tao/Special_Basic_Argument_T.h"
@@ -9,9 +9,7 @@
#include "tao/Special_Basic_Argument_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- Special_Basic_Argument_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S, typename to_S, typename from_S, typename Insert_Policy>
CORBA::Boolean
@@ -109,5 +107,7 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_valu
#endif /* TAO_HAS_INTERCEPTORS */
-#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index e113596d8a3..b3f1df89e3a 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -23,6 +23,8 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -148,6 +150,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/Special_Basic_Argument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
index 850c2209cbb..cf8b7b4e57e 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
template<typename S, typename to_S, typename from_S, typename Insert_Policy>
ACE_INLINE
TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Argument_T (
@@ -85,3 +87,4 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void)
return this->x_;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h
index 49e8e16e9e6..ff938db4b58 100644
--- a/TAO/tao/Special_Basic_Arguments.h
+++ b/TAO/tao/Special_Basic_Arguments.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
*/
//=============================================================================
@@ -23,7 +24,9 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/Special_Basic_Argument_T.h"
-#include "Arg_Traits_T.h"
+#include "tao/Arg_Traits_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
{
@@ -70,6 +73,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/"ace/post.h"
#endif /* TAO_SPECIAL_BASIC_ARGUMENTS_H */
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 5aa6f7ab6db..3ce406379fe 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -28,6 +28,7 @@ ACE_RCSID (tao,
TAO_Stub,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Stub::TAO_Stub (const char *repository_id,
const TAO_MProfile &profiles,
@@ -581,3 +582,4 @@ TAO_Stub::transport_queueing_strategy (void)
return this->orb_core_->default_transport_queueing_strategy ();
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index ee0a989a50a..c6dc6361950 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -33,6 +33,8 @@
# undef IOR
#endif /* HPUX && IOR */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Forward declarations.
class TAO_Policy_Set;
class TAO_Profile;
@@ -383,6 +385,8 @@ protected:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Stub.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index 4f11130af6b..a0f042932c9 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE void
TAO_Stub::reset_base (void)
{
@@ -313,3 +315,5 @@ TAO_Stub_Auto_Ptr::operator *() const
// @@ Potential problem if this->p_ is zero!
return *this->get ();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index ef283dd3e3b..0c2bfa1ff8b 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -33,6 +33,8 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
Synch_Twoway_Invocation::Synch_Twoway_Invocation (
@@ -787,3 +789,5 @@ namespace TAO
return s;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index b4ff18b1a1a..7707cfc35df 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -22,10 +22,13 @@
#include "tao/SystemException.h"
+class ACE_Time_Value;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Operation_Details;
class TAO_Synch_Reply_Dispatcher;
class TAO_InputCDR;
-class ACE_Time_Value;
class TAO_Bind_Dispatcher_Guard;
namespace TAO
@@ -200,6 +203,7 @@ namespace TAO
}
+TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
# include "tao/Synch_Invocation.inl"
diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl
index ccf61f981f2..649d3245412 100644
--- a/TAO/tao/Synch_Invocation.inl
+++ b/TAO/tao/Synch_Invocation.inl
@@ -1,5 +1,9 @@
// -*- C++ -*-
+//
// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
ACE_INLINE
@@ -22,3 +26,5 @@ namespace TAO
this->status_ = s;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 58cbf2afb3e..cce9c918c70 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -11,11 +11,13 @@ ACE_RCSID (tao,
Synch_Queued_Message,
"$Id$")
-TAO_Synch_Queued_Message::
- TAO_Synch_Queued_Message (const ACE_Message_Block *contents,
- TAO_ORB_Core *oc,
- ACE_Allocator *alloc,
- int is_heap_allocated)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Synch_Queued_Message::TAO_Synch_Queued_Message (
+ const ACE_Message_Block *contents,
+ TAO_ORB_Core *oc,
+ ACE_Allocator *alloc,
+ int is_heap_allocated)
: TAO_Queued_Message (oc, alloc, is_heap_allocated)
, contents_ (const_cast<ACE_Message_Block*> (contents))
, current_block_ (contents_)
@@ -178,3 +180,5 @@ TAO_Synch_Queued_Message::destroy (void)
}
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index f587c87e816..c04e0a8832d 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -21,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Synch_Queued_Message
*
@@ -90,6 +92,8 @@ private:
ACE_Message_Block *current_block_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index d901b7b93e3..fefde1ebf4c 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (tao,
Synch_Reply_Dispatcher,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Constructor.
TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (
TAO_ORB_Core *orb_core,
@@ -104,3 +106,5 @@ TAO_Synch_Reply_Dispatcher::connection_closed (void)
this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
this->orb_core_->leader_follower ());
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index 6774d5c2d87..c22e515cd47 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -6,8 +6,7 @@
*
* $Id$
*
- * Dispatch the reply appropriately.
- *
+ * Dispatch the reply appropriately.
*
* @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
*/
@@ -27,6 +26,8 @@
#include "tao/LF_Invocation_Event.h"
#include "tao/CDR.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Pluggable_Reply_Params;
namespace IOP
@@ -87,6 +88,8 @@ private:
TAO_InputCDR reply_cdr_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index b0089ead714..b562738d50c 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -30,6 +30,8 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @name @c errno Encoding
*
@@ -814,6 +816,8 @@ CORBA::SystemException::_tao_get_omg_exception_description (
return "*unknown description*";
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
#undef THREAD_CANCELLED
#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
@@ -877,6 +881,7 @@ static const char *repo_id_array[] = {
static const CORBA::ULong array_sz =
(sizeof (repo_id_array) / sizeof (char const *)) - 1;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO::excp_factory excp_array [] = {
#define TAO_SYSTEM_EXCEPTION(name) \
@@ -975,3 +980,5 @@ CORBA::name ::_tao_create (void) \
STANDARD_EXCEPTION_LIST
#undef TAO_SYSTEM_EXCEPTION
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 54a7b4dcf49..6a60767e525 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -29,6 +29,8 @@
#include "tao/Exception.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_OutputCDR;
class TAO_InputCDR;
@@ -236,6 +238,7 @@ namespace CORBA
} // End CORBA namespace
+TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
# include "tao/SystemException.inl"
diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl
index 9366410df75..25409d98218 100644
--- a/TAO/tao/SystemException.inl
+++ b/TAO/tao/SystemException.inl
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE CORBA::ULong
CORBA::SystemException::minor (void) const
{
@@ -110,3 +112,5 @@ CORBA::name ::_tao_any_destructor (void * x) \
TAO_STANDARD_SYSTEM_EXCEPTION_LIST
#undef TAO_SYSTEM_EXCEPTION
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index df3470edc78..f7be84ace4a 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -87,6 +87,8 @@ namespace
TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
int
TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
{
@@ -278,6 +280,8 @@ TAO::ORB::default_svc_conf_entries (char const * rf_args,
client_strategy_factory_args = csf_args;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
// -----------------------------------------------------
namespace
{
@@ -436,3 +440,4 @@ namespace
}
}
+// TAO_BEGIN_VERSIONED_NAMESPACE_DECL -- ended prior to anonymous namespace.
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index c7075d34bf7..920f554db57 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -46,6 +46,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
#endif /* ACE_ENABLE_TIMEPROBES */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
TAO_InputCDR &input,
TAO_OutputCDR &output,
@@ -562,4 +564,6 @@ TAO_ServerRequest::pi_current_copy_callback (void)
return this->pi_current_copy_callback_;
}
-#endif /*TAO_HAS_INTERCEPTORS*/
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 29b11e2503a..b2013c267f1 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -26,9 +26,11 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "Tagged_Profile.h"
-#include "Service_Context.h"
-#include "Object.h"
+#include "tao/Tagged_Profile.h"
+#include "tao/Service_Context.h"
+#include "tao/Object.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
#if TAO_HAS_INTERCEPTORS == 1
namespace TAO
@@ -367,6 +369,8 @@ private:
#endif /* TAO_HAS_INTERCEPTORS == 1 */
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "TAO_Server_Request.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index a75efcab263..5fc7f50ab9b 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE TAO_ORB_Core *
TAO_ServerRequest::orb_core (void) const
{
@@ -234,3 +236,5 @@ TAO_ServerRequest::reply_status (void)
}
#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
index 13ea18bf273..dc8493856a9 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -21,9 +21,7 @@
#include "tao/TAO_Singleton.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- TAO_Singleton,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE, class ACE_LOCK> void
TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
@@ -206,4 +204,6 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#endif /* TAO_SINGLETON_CPP */
diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h
index b4c2194f86c..9e28c5f8364 100644
--- a/TAO/tao/TAO_Singleton.h
+++ b/TAO/tao/TAO_Singleton.h
@@ -28,6 +28,8 @@
#include "ace/Cleanup.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Singleton
*
@@ -118,6 +120,8 @@ private:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/TAO_Singleton.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl
index d1d32b6998c..bacacea205e 100644
--- a/TAO/tao/TAO_Singleton.inl
+++ b/TAO/tao/TAO_Singleton.inl
@@ -1,6 +1,10 @@
// -*- C++ -*-
+//
// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Default constructors.
//
// Note: don't explicitly initialize "instance_", because TYPE may not
@@ -15,3 +19,5 @@ template <class TYPE, class ACE_LOCK> ACE_INLINE
TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void)
{
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index fcacaa78283..f871ae6504d 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -29,7 +29,7 @@ ACE_RCSID (tao,
"$Id$")
extern "C" void
-TAO_Singleton_Manager_cleanup_destroyer (void *, void *)
+TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *)
{
if (TAO_Singleton_Manager::instance_)
{
@@ -37,6 +37,8 @@ TAO_Singleton_Manager_cleanup_destroyer (void *, void *)
}
}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Singleton_Manager *TAO_Singleton_Manager::instance_ = 0;
void *TAO_Singleton_Manager::preallocated_object[
@@ -338,3 +340,5 @@ TAO_Singleton_Manager::at_exit_i (void *object,
return this->exit_info_.at_exit_i (object, cleanup_hook, param);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 891a31ebf0e..7e52b9e3630 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -28,16 +28,32 @@
#include "tao/orbconf.h"
#include "ace/Object_Manager_Base.h"
-#if defined (ACE_HAS_EXCEPTIONS)
-typedef void (*TAO_unexpected_handler)(void);
-#endif /* ACE_HAS_EXCEPTIONS */
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \
+ && ACE_HAS_VERSIONED_NAMESPACE == 1) \
+ && !(defined (_MSC_VER) && _MSC_VER <= 1200)
+// MSVC++ 6's preprocessor can't handle macro expansions required by
+// the versioned namespace support. *sigh*
+
+# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_Singleton_Manager_cleanup_destroyer)
+#else
+
+# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME TAO_Singleton_Manager_cleanup_destroyer
+
+#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
/// Adapter for cleanup, used to register cleanup function with the
/// ACE_Object_Manager.
extern "C"
void
-TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
+TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *);
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_HAS_EXCEPTIONS)
+typedef void (*TAO_unexpected_handler)(void);
+#endif /* ACE_HAS_EXCEPTIONS */
/**
@@ -60,7 +76,7 @@ TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base
{
- friend void TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
+ friend void TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *);
public:
/// Explicitly initialize.
@@ -215,6 +231,8 @@ private:
#endif /* ACE_HAS_EXCEPTIONS */
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/TAO_Singleton_Manager.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/TAO_Singleton_Manager.inl b/TAO/tao/TAO_Singleton_Manager.inl
index f9f0dd141ce..a316780aed7 100644
--- a/TAO/tao/TAO_Singleton_Manager.inl
+++ b/TAO/tao/TAO_Singleton_Manager.inl
@@ -2,10 +2,12 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
int
TAO_Singleton_Manager::at_exit (ACE_Cleanup *object,
- void *param)
+ void *param)
{
return TAO_Singleton_Manager::instance ()->at_exit_i (
object,
@@ -16,11 +18,13 @@ TAO_Singleton_Manager::at_exit (ACE_Cleanup *object,
ACE_INLINE
int
TAO_Singleton_Manager::at_exit (void *object,
- ACE_CLEANUP_FUNC cleanup_hook,
- void *param)
+ ACE_CLEANUP_FUNC cleanup_hook,
+ void *param)
{
return TAO_Singleton_Manager::instance ()->at_exit_i (
object,
cleanup_hook,
param);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index e80f9cab0cc..8b243ca7878 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_TSS_Resources::TAO_TSS_Resources (void)
: poa_current_impl_ (0)
, rtscheduler_current_impl_ (0)
@@ -45,3 +47,5 @@ template
TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> *
TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_;
#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index a33983a0dc6..f20e646ed19 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -27,6 +27,8 @@
#include "tao/Policy_Current_Impl.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Forward declarations
namespace TAO
{
@@ -105,6 +107,8 @@ public:
TAO::GUIResource_Factory * gui_resource_factory_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_TSS_RESOURCES_H */
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index 8b2c8490649..172dde55018 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -13,6 +13,9 @@ ACE_RCSID (tao,
Tagged_Components,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
void
TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type)
{
@@ -338,3 +341,4 @@ TAO_Tagged_Components::decode (TAO_InputCDR& cdr)
return 1;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
index 75f756a2093..93f2a927bf3 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -23,6 +23,9 @@
#include "tao/CONV_FRAMEC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Profile;
/// Tag for storing multiple endpoints within a single profile.
@@ -31,7 +34,7 @@ class TAO_Profile;
* The standard TAG_ALTERNATE_IIOP_ADDRESSES tagged component is the
* portable alternative.
*/
-const CORBA::ULong TAO_TAG_ENDPOINTS = 0x54414f02U;
+static const CORBA::ULong TAO_TAG_ENDPOINTS = 0x54414f02U;
/**
* @class TAO_Tagged_Components
@@ -155,6 +158,8 @@ private:
CORBA::Octet code_sets_set_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Tagged_Components.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i
index 62ab4a40f05..cb61b5235b4 100644
--- a/TAO/tao/Tagged_Components.i
+++ b/TAO/tao/Tagged_Components.i
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Tagged_Components::TAO_Tagged_Components (void)
: orb_type_ (0),
@@ -76,3 +78,5 @@ TAO_Tagged_Components::components (void)
{
return this->components_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index cfe643f6066..e5bed686c15 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (tao,
Tagged_Profile,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
CORBA::Boolean
TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
{
@@ -192,3 +194,5 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i (
return hdr_status;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index b7706dca0c7..58b0ff93167 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -22,8 +22,11 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/Object_KeyC.h"
+#include "tao/Versioned_Namespace.h"
#include "ace/SString.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
namespace CSD
@@ -141,6 +144,8 @@ private:
ACE_CString type_id_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Tagged_Profile.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i
index 52e7b34fae1..60249f0ef37 100644
--- a/TAO/tao/Tagged_Profile.i
+++ b/TAO/tao/Tagged_Profile.i
@@ -1,6 +1,9 @@
// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
: orb_core_ (orb_core),
@@ -13,7 +16,6 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
}
-
ACE_INLINE TAO::ObjectKey &
TAO_Tagged_Profile::object_key (void)
{
@@ -61,3 +63,5 @@ TAO_Tagged_Profile::discriminator (void) const
{
return this->discriminator_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 1168a525d4f..9f639f4b6c4 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -17,6 +17,9 @@ ACE_RCSID (tao,
#include "ace/Reactor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (
TAO_ORB_Core &orb_core,
TAO_New_Leader_Generator *new_leader_generator
@@ -551,3 +554,5 @@ TAO_Thread_Lane_Resources::cleanup_rw_transports (void)
(*handler)->transport ()->remove_reference ();
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index f0c1a61a07f..307dee679bd 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -27,6 +27,9 @@
#include "params.h"
class ACE_Allocator;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_Acceptor_Registry;
class TAO_Leader_Follower;
@@ -207,6 +210,8 @@ private:
//@}
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_THREAD_LANE_RESOURCES_H */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
index d004966c26b..8a3465d2648 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (tao,
Thread_Lane_Resources_Manager,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
: orb_core_ (&orb_core),
lf_strategy_ (0)
@@ -33,3 +35,4 @@ TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Fa
{
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index 6cd522c8298..8ec54b4d5ef 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (tao,
Thread_Per_Connection_Handler,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler (
TAO_Connection_Handler *ch,
TAO_ORB_Core *oc)
@@ -81,3 +83,5 @@ TAO_Thread_Per_Connection_Handler::close (u_long)
return 0;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
index 08ed211ae58..cf51317e646 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+//x -*- C++ -*-
//=============================================================================
/**
@@ -24,6 +24,9 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Connection_Handler;
class TAO_ORB_Core;
@@ -77,6 +80,8 @@ private:
TAO_Connection_Handler *ch_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /*TAO_THREAD_PER_CONNECTION_HANDLER_H*/
diff --git a/TAO/tao/TkResource_Factory.cpp b/TAO/tao/TkResource_Factory.cpp
index 765e7a40e02..d9d6d3dffeb 100644
--- a/TAO/tao/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource_Factory.cpp
@@ -9,11 +9,13 @@ ACE_RCSID( TAO_TkResource,
"$Id$");
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
- TkResource_Factory::TkResource_Factory ():
- reactor_impl_( 0 )
+ TkResource_Factory::TkResource_Factory (void)
+ : reactor_impl_ (0)
{
}
@@ -35,3 +37,5 @@ namespace TAO
return this->reactor_impl_;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource_Factory.h b/TAO/tao/TkResource_Factory.h
index e08b436d274..7fe5bb140ac 100644
--- a/TAO/tao/TkResource_Factory.h
+++ b/TAO/tao/TkResource_Factory.h
@@ -21,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
@@ -55,5 +57,8 @@ namespace TAO
TAO_SYNCH_MUTEX lock_;
};
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_TKRESOURCE_FACTORY_H */
diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource_Loader.cpp
index 782fbc92bf0..9aec129aad4 100644
--- a/TAO/tao/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource_Loader.cpp
@@ -7,10 +7,13 @@ ACE_RCSID( TAO_TkResource,
TkResource_Loader,
"$Id$");
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
- TkResource_Loader::TkResource_Loader ()
+ TkResource_Loader::TkResource_Loader (void)
{
TkResource_Factory *tmp = 0;
@@ -20,7 +23,9 @@ namespace TAO
TAO_ORB_Core::set_gui_resource_factory( tmp );
}
- TkResource_Loader::~TkResource_Loader ()
+ TkResource_Loader::~TkResource_Loader (void)
{
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h
index 9b20a5eac02..526a705bd1c 100644
--- a/TAO/tao/TkResource_Loader.h
+++ b/TAO/tao/TkResource_Loader.h
@@ -13,13 +13,17 @@
#ifndef TAO_TKRESOURCE_LOADER_H
#define TAO_TKRESOURCE_LOADER_H
+
#include /**/ "ace/pre.h"
+
#include "tao/TAO_TkResource_Export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -38,12 +42,17 @@ namespace TAO
*/
class TAO_TkResource_Export TkResource_Loader
{
-
public:
- TkResource_Loader ( );
- virtual ~TkResource_Loader ();
+ TkResource_Loader (void);
+
+ virtual ~TkResource_Loader (void);
+
};
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
+
#endif /* TAO_TKRESOURCE_LOADER_H */
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 95ae63ed610..9606232a1c6 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -112,6 +112,8 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
ACE_Log_Msg::instance ()->release ();
}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Transport::TAO_Transport (CORBA::ULong tag,
TAO_ORB_Core *orb_core)
: tag_ (tag)
@@ -2498,3 +2500,5 @@ TAO_Transport::allocate_partial_message_block (void)
*/
//@@ TAO_TRANSPORT_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ca542ee7eb0..d2afe08c1ee 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -28,6 +28,10 @@
#include "tao/Incoming_Message_Queue.h"
#include "ace/Time_Value.h"
+struct iovec;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_Target_Specification;
class TAO_Operation_Details;
@@ -41,7 +45,6 @@ class TAO_Queued_Message;
class TAO_Synch_Queued_Message;
class TAO_Resume_Handle;
class TAO_Stub;
-struct iovec;
namespace TAO
{
@@ -1064,6 +1067,8 @@ private:
//@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Transport.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index 6c0d7d0093a..ef9faafb1ac 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -1,6 +1,9 @@
// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE CORBA::ULong
TAO_Transport::tag (void) const
{
@@ -186,4 +189,4 @@ TAO_Transport::sent_byte_count (void) const
return this->sent_byte_count_;
}
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp
index a4825e9286c..3671852f8b4 100644
--- a/TAO/tao/Transport_Acceptor.cpp
+++ b/TAO/tao/Transport_Acceptor.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
// $Id$
#include "Transport_Acceptor.h"
@@ -12,6 +10,9 @@ ACE_RCSID (tao,
Acceptor,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
: tag_ (tag)
{
@@ -24,3 +25,5 @@ TAO_Acceptor::~TAO_Acceptor (void)
}
//@@ TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index ea5df9baf97..b27d43cdef3 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -29,6 +29,9 @@
// Forward declarations.
class ACE_Addr;
class ACE_Reactor;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_MProfile;
class TAO_Endpoint;
@@ -139,7 +142,7 @@ public:
private:
/// IOP protocol tag.
- CORBA::ULong tag_;
+ CORBA::ULong const tag_;
/*
* Hook to add data members from concrete acceptor implementations onto
@@ -150,6 +153,8 @@ private:
//@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Transport_Acceptor.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl
index 7d91a8330a3..7767ec6b43e 100644
--- a/TAO/tao/Transport_Acceptor.inl
+++ b/TAO/tao/Transport_Acceptor.inl
@@ -1,7 +1,13 @@
// -*- C++ -*-
+//
// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE CORBA::ULong
TAO_Acceptor::tag (void) const
{
return this->tag_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 9a44900fe59..cb8d3b02434 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -15,11 +15,13 @@
#endif /* __ACE_INLINE__ */
-
ACE_RCSID (tao,
Transport_Cache_Manager,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
Transport_Cache_Manager::Transport_Cache_Manager (TAO_ORB_Core &orb_core)
@@ -717,3 +719,5 @@ namespace TAO
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h
index 749cbe9492d..ac1ba979530 100644
--- a/TAO/tao/Transport_Cache_Manager.h
+++ b/TAO/tao/Transport_Cache_Manager.h
@@ -26,14 +26,17 @@
#include "tao/orbconf.h"
class ACE_Handle_Set;
+template <class T> class ACE_Unbounded_Set;
+template <class T> class ACE_Unbounded_Set_Iterator;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Connection_Handler;
class TAO_ORB_Core;
class TAO_Resource_Factory;
class TAO_Connection_Purging_Strategy;
template <class ACE_COND_MUTEX> class TAO_Condition;
-template <class T> class ACE_Unbounded_Set;
-template <class T> class ACE_Unbounded_Set_Iterator;
namespace TAO
{
@@ -259,6 +262,9 @@ namespace TAO
};
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Transport_Cache_Manager.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Cache_Manager.inl b/TAO/tao/Transport_Cache_Manager.inl
index 08c81369837..ed53a1a4f90 100644
--- a/TAO/tao/Transport_Cache_Manager.inl
+++ b/TAO/tao/Transport_Cache_Manager.inl
@@ -1,5 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
//$Id$
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
ACE_INLINE int
@@ -148,3 +153,5 @@ namespace TAO
return this->cache_map_;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index a4187c34ba2..48d68507549 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -25,10 +25,13 @@ ACE_RCSID (tao,
Connector,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Connector
TAO_Connector::TAO_Connector (CORBA::ULong tag)
: active_connect_strategy_ (0),
- tag_(tag),
+ tag_ (tag),
orb_core_ (0)
{
}
@@ -527,3 +530,5 @@ TAO_Connector::check_connection_closure (
}
//@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 720aaab0e76..e2ea0c77bbc 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -27,6 +27,9 @@
#include "Basic_Types.h"
class ACE_Time_Value;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Transport_Descriptor_Interface;
class TAO_InputCDR;
class TAO_Endpoint;
@@ -187,7 +190,7 @@ protected:
private:
/// IOP protocol tag.
- CORBA::ULong tag_;
+ CORBA::ULong const tag_;
/// Pointer to our ORB core
TAO_ORB_Core *orb_core_;
@@ -197,6 +200,8 @@ private:
//@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Transport_Connector.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl
index c25d96057fb..64683bc6a14 100644
--- a/TAO/tao/Transport_Connector.inl
+++ b/TAO/tao/Transport_Connector.inl
@@ -1,5 +1,9 @@
// -*- C++ -*-
+//
// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE TAO_ORB_Core *
TAO_Connector::orb_core (void)
{
@@ -17,3 +21,5 @@ TAO_Connector::tag (void) const
{
return this->tag_;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
index 6882cc3b8a6..a58af5ac064 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -10,11 +10,15 @@ ACE_RCSID (tao,
Transport_Descriptor_Interface,
"$Id$")
-TAO_Transport_Descriptor_Interface::
- ~TAO_Transport_Descriptor_Interface (void)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void)
{
if (this->endpoint_from_heap_)
{
delete this->endpoint_;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
index 7eba381787f..0934238d072 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -23,6 +23,8 @@
#include "tao/Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Endpoint;
/**
@@ -84,6 +86,8 @@ protected:
CORBA::Boolean endpoint_from_heap_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/Transport_Descriptor_Interface.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
index 97bcf5291f4..61dcf2f2443 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -1,21 +1,24 @@
+// -*- C++ -*-
+//
//$Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
-TAO_Transport_Descriptor_Interface::
- TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
- CORBA::Boolean flag)
- : endpoint_ (endpoint),
- bidir_flag_ (0),
- endpoint_from_heap_ (flag)
+TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (
+ TAO_Endpoint *endpoint,
+ CORBA::Boolean flag)
+ : endpoint_ (endpoint),
+ bidir_flag_ (0),
+ endpoint_from_heap_ (flag)
{
}
ACE_INLINE
-TAO_Transport_Descriptor_Interface::
- TAO_Transport_Descriptor_Interface (void)
- : endpoint_ (0),
- bidir_flag_ (0),
- endpoint_from_heap_ (0)
+TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void)
+ : endpoint_ (0),
+ bidir_flag_ (0),
+ endpoint_from_heap_ (0)
{
}
@@ -32,3 +35,5 @@ TAO_Transport_Descriptor_Interface::set_bidir_flag (CORBA::Boolean flag)
{
this->bidir_flag_ = flag;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index e11ed482657..beb04aba840 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -6,6 +6,9 @@ ACE_RCSID (tao,
Transport_Mux_Strategy,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
TAO_Transport *transport)
: transport_ (transport)
@@ -16,3 +19,5 @@ TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
{
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 9e019e5311c..4d92a51c558 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -23,10 +23,13 @@
#include "tao/Basic_Types.h"
+class ACE_Lock;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Reply_Dispatcher;
class TAO_Transport;
class TAO_Pluggable_Reply_Params;
-class ACE_Lock;
/**
* @class TAO_Transport_Mux_Strategy
@@ -93,6 +96,8 @@ protected:
ACE_Lock *lock_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TRANSPORT_MUX_STRATEGY_H */
diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp
index 17235308f7a..36405c87aef 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -12,6 +12,9 @@ ACE_RCSID (tao,
Transport_Queueing_Strategies,
"$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
Transport_Queueing_Strategy::~Transport_Queueing_Strategy (void)
@@ -224,3 +227,5 @@ namespace TAO
#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h
index ad572969725..4401663bdbb 100644
--- a/TAO/tao/Transport_Queueing_Strategies.h
+++ b/TAO/tao/Transport_Queueing_Strategies.h
@@ -27,9 +27,12 @@
#include "tao/orbconf.h"
#include "tao/Basic_Types.h"
-class TAO_Stub;
class ACE_Time_Value;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Stub;
+
namespace TAO
{
struct BufferingConstraint;
@@ -173,6 +176,8 @@ namespace TAO
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_TRANSPORT_QUEUEING_STRATEGY_H */
diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp
index 0d592fb8459..210417b250f 100644
--- a/TAO/tao/Transport_Timer.cpp
+++ b/TAO/tao/Transport_Timer.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
// $Id$
#include "Transport_Timer.h"
@@ -8,6 +7,8 @@ ACE_RCSID (tao,
Transport_Timer,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport)
: transport_ (transport)
{
@@ -19,3 +20,5 @@ TAO_Transport_Timer::handle_timeout (const ACE_Time_Value &current_time,
{
return this->transport_->handle_timeout (current_time, act);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Timer.h b/TAO/tao/Transport_Timer.h
index b951456e0cb..50593fff2e4 100644
--- a/TAO/tao/Transport_Timer.h
+++ b/TAO/tao/Transport_Timer.h
@@ -20,7 +20,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Transport;
@@ -51,6 +54,8 @@ private:
TAO_Transport *transport_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_TRANSPORT_TIMER_H */
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 1e6e09eb1ff..7c7c3a909c9 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -26,6 +26,8 @@
template<class T> class ACE_Array_Base;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace CORBA
{
class EnumMemberSeq;
@@ -271,6 +273,8 @@ public:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_TYPECODEFACTORY_ADAPTER_H */
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a84a261ed85..ede48dd16e4 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_UB_STRING_ARGUMENT_T_C
-#define TAO_UB_STRING_ARGUMENT_T_C
+#ifndef TAO_UB_STRING_ARGUMENT_T_CPP
+#define TAO_UB_STRING_ARGUMENT_T_CPP
#include "tao/UB_String_Argument_T.h"
#include "tao/CDR.h"
@@ -10,9 +10,7 @@
#include "tao/UB_String_Argument_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- UB_String_Argument_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S, typename Insert_Policy>
CORBA::Boolean
@@ -102,4 +100,6 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value (
#endif /* TAO_HAS_INTERCEPTORS */
-#endif /* TAO_UB_STRING_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_UB_STRING_ARGUMENT_T_CPP */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 2b4b3d25214..5b269e0a570 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -6,7 +6,8 @@
*
* $Id$
*
- * @authors Jeff Parsons and Carlos O'Ryan
+ * @author Jeff Parsons
+ * @author Carlos O'Ryan
*/
//=============================================================================
@@ -21,6 +22,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -146,6 +149,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/UB_String_Argument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index b6f6a97db6e..370d3931dd9 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -1,8 +1,13 @@
+// -*- C++ -*-
+//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
template<typename S, typename Insert_Policy>
ACE_INLINE
-TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (const S * x)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (
+ const S * x)
: x_ (x)
{}
@@ -77,3 +82,4 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::retn (void)
return this->x_._retn ();
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h
index a5268d9a6d2..7e78f4749fa 100644
--- a/TAO/tao/UB_String_Arguments.h
+++ b/TAO/tao/UB_String_Arguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -24,6 +24,8 @@
#include "tao/Arg_Traits_T.h"
#include "tao/Any_Insert_Policy_T.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -51,5 +53,7 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_UB_STRING_ARGUMENTS_H */
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 0e382b85985..361898528c0 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Virtual. Do not inline.
CORBA::UserException::~UserException (void)
{
@@ -44,3 +46,5 @@ CORBA::UserException::_info (void) const
user_exception_info += "'";
return user_exception_info;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index 79aa80e8766..f3f2dcec89f 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -26,6 +26,8 @@
#include "tao/Exception.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace CORBA
{
/**
@@ -78,6 +80,8 @@ namespace CORBA
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/UserException.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index ba01c46e9fd..0e1d3295264 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
CORBA::UserException::UserException (void)
{
@@ -32,3 +34,5 @@ CORBA::UserException::_downcast (CORBA::Exception const * exception)
{
return dynamic_cast<const CORBA::UserException *> (exception);
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 62594d81764..42cf8207876 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
#include "tao/Valuetype_Adapter.h"
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
Valuetype_Adapter,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
{
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h
index a0386ccf7e6..3dff9f15929 100644
--- a/TAO/tao/Valuetype_Adapter.h
+++ b/TAO/tao/Valuetype_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -23,6 +23,8 @@
#include "tao/TAO_Export.h"
#include "tao/Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace CORBA
{
class Object;
@@ -76,5 +78,7 @@ public:
virtual CORBA::ValueFactory vf_map_find (const char *) = 0;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_VALUETYPE_ADAPTER_H */
diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp
index 618198edfad..b53bedc3a62 100644
--- a/TAO/tao/VarOut_T.cpp
+++ b/TAO/tao/VarOut_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_VAROUT_T_C
-#define TAO_VAROUT_T_C
+#ifndef TAO_VAROUT_T_CPP
+#define TAO_VAROUT_T_CPP
#include "tao/VarOut_T.h"
@@ -9,22 +9,12 @@
#include "tao/VarOut_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- VarOut_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T>
TAO_Var_Base_T<T>::TAO_Var_Base_T (const TAO_Var_Base_T<T> & p)
+ : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0)
{
- if (p.ptr_)
- {
- ACE_NEW (this->ptr_,
- T (*p.ptr_));
- }
- else
- {
- this->ptr_ = 0;
- }
}
// *************************************************************
@@ -33,29 +23,13 @@ template<typename T>
TAO_Fixed_Var_T<T> &
TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p)
{
- if (this != &p)
- {
- if (p.ptr_ == 0)
- {
- delete this->ptr_;
- this->ptr_ = 0;
- }
- else
- {
- T * deep_copy = 0;
- ACE_NEW_RETURN (deep_copy,
- T (*p.ptr_),
- *this);
-
- if (deep_copy != 0)
- {
- T * tmp = deep_copy;
- deep_copy = this->ptr_;
- this->ptr_ = tmp;
- delete deep_copy;
- }
- }
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_Fixed_Var_T<T> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
@@ -65,13 +39,13 @@ template<typename T>
TAO_Fixed_Var_T<T> &
TAO_Fixed_Var_T<T>::operator= (const T & p)
{
- if (this->ptr_ != &p)
- {
- delete this->ptr_;
- ACE_NEW_RETURN (this->ptr_,
- T (p),
- *this);
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_Fixed_Var_T<T> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
@@ -82,31 +56,15 @@ template<typename T>
TAO_Var_Var_T<T> &
TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p)
{
- if (this != &p)
- {
- if (p.ptr_ == 0)
- {
- delete this->ptr_;
- this->ptr_ = 0;
- }
- else
- {
- T *deep_copy = 0;
- ACE_NEW_RETURN (deep_copy,
- T (*p.ptr_),
- *this);
-
- if (deep_copy != 0)
- {
- T * tmp = deep_copy;
- deep_copy = this->ptr_;
- this->ptr_ = tmp;
- delete deep_copy;
- }
- }
- }
+ // Strongly exception safe assignment using copy and non-throwing
+ // swap technique.
+ TAO_Var_Var_T<T> tmp (p);
+
+ T * old_ptr = this->ptr_;
+ this->ptr_ = tmp.ptr_;
+ tmp.ptr_ = old_ptr;
return *this;
}
-#endif /* TAO_VAROUT_T_C */
+#endif /* TAO_VAROUT_T_CPP */
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
index 709f8ba5ddb..8602661bf48 100644
--- a/TAO/tao/VarOut_T.h
+++ b/TAO/tao/VarOut_T.h
@@ -21,6 +21,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/**
* @class TAO_Var_Base_T
@@ -152,6 +153,8 @@ private:
void operator= (const T_var &);
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/VarOut_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl
index c1e7af81406..5368b31ee2f 100644
--- a/TAO/tao/VarOut_T.inl
+++ b/TAO/tao/VarOut_T.inl
@@ -1,4 +1,8 @@
-//$Id$
+// -*- C++ -*-
+//
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T>
ACE_INLINE
@@ -259,3 +263,4 @@ TAO_Out_T<T,T_var>::operator-> (void)
return this->ptr_;
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index 97d0b014e02..e1ad6bdd0ae 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_VAR_ARRAY_ARGUMENT_T_C
-#define TAO_VAR_ARRAY_ARGUMENT_T_C
+#ifndef TAO_VAR_ARRAY_ARGUMENT_T_CPP
+#define TAO_VAR_ARRAY_ARGUMENT_T_CPP
#include "tao/Var_Array_Argument_T.h"
@@ -9,9 +9,7 @@
#include "tao/Var_Array_Argument_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- Var_Array_Argument_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
typename S_slice,
@@ -162,4 +160,6 @@ interceptor_value (CORBA::Any *any) const
#endif /* TAO_HAS_INTERCEPTORS */
-#endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VAR_ARRAY_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 75cb050ecc2..8b7ecbbf3c2 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -21,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -186,6 +188,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/Var_Array_Argument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index 072b68039fc..ce041fd3fb0 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
template<typename S,
typename S_slice,
typename S_forany,
@@ -129,3 +131,5 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::ret
{
return this->x_._retn ();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 290c17b4909..addbd7f9a2d 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -1,7 +1,7 @@
// $Id$
-#ifndef TAO_VAR_SIZE_ARGUMENT_T_C
-#define TAO_VAR_SIZE_ARGUMENT_T_C
+#ifndef TAO_VAR_SIZE_ARGUMENT_T_CPP
+#define TAO_VAR_SIZE_ARGUMENT_T_CPP
#include "tao/Var_Size_Argument_T.h"
@@ -9,9 +9,7 @@
#include "tao/Var_Size_Argument_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (tao,
- Var_Size_Argument_T,
- "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
typename Insert_Policy>
@@ -117,4 +115,6 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::interceptor_value (CORBA::A
#endif /* TAO_HAS_INTERCEPTORS */
-#endif /* TAO_VAR_SIZE_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VAR_SIZE_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index fa1afc31536..29941828854 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -21,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
/**
@@ -147,6 +149,8 @@ namespace TAO
};
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "tao/Var_Size_Argument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
index b5c240dfa8a..909e94ffb1f 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
// $Id$
template<typename S,
@@ -96,3 +98,4 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::retn (void)
return this->x_._retn ();
}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 00075a77b84..e35ab4b56aa 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(tao,
Wait_On_LF_No_Upcall,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_Transport;
namespace TAO
{
@@ -100,3 +102,5 @@ namespace TAO
return true;
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index d2ea3b899f8..8c839eba3bc 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -13,6 +13,7 @@
#ifndef TAO_WAIT_ON_LF_NO_UPCALL_H
#define TAO_WAIT_ON_LF_NO_UPCALL_H
+
#include /**/ "ace/pre.h"
#include "tao/Wait_On_Leader_Follower.h"
@@ -21,9 +22,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
-
/**
* @class TAO_Wait_On_LF_No_Upcall
*
@@ -54,5 +56,9 @@ namespace TAO
virtual bool can_process_upcalls (void) const;
};
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
+
#endif /* TAO_WAIT_ON_LF_NO_UPCALL_H */
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 82ac698e591..b8935c80af6 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -11,6 +11,8 @@ ACE_RCSID (tao,
Wait_On_Leader_Follower,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
: TAO_Wait_Strategy (transport)
{
@@ -68,3 +70,5 @@ TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
{
return true;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index 5db60e5808b..f775c66d9c0 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.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
+
/**
* @class TAO_Wait_On_Leader_Follower
*
@@ -55,6 +57,8 @@ public:
virtual bool can_process_upcalls (void) const;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_WAIT_ON_LEADER_FOLLOWER_H */
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 9168df03344..9eaf0efcbd2 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (tao,
Wait_On_Reactor,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
: TAO_Wait_Strategy (transport)
{
@@ -115,3 +117,5 @@ TAO_Wait_On_Reactor::can_process_upcalls (void) const
{
return true;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index 566a419efd1..212590b4d56 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.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
+
/**
* @class TAO_Wait_On_Reactor
*
@@ -47,6 +49,8 @@ public:
virtual bool can_process_upcalls (void) const;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_WAIT_ON_REACTOR_H */
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 3d17ac729a3..fb0f2fa2395 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
Wait_On_Read,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Constructor.
TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
: TAO_Wait_Strategy (transport)
@@ -136,3 +138,5 @@ TAO_Wait_On_Read::can_process_upcalls (void) const
/*
* End copy hook.
*/
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index e946f07d4a3..c691a668200 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -21,6 +21,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Wait_On_Read
*
@@ -46,6 +48,8 @@ public:
virtual bool can_process_upcalls (void) const;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_WAIT_ON_READ_H */
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 15a48b36b79..d7ad89b5bbe 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -10,6 +10,9 @@ ACE_RCSID (tao,
# include "Wait_Strategy.inl"
#endif /* __ACE_INLINE__ */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
// Constructor.
TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
: transport_ (transport),
@@ -34,3 +37,5 @@ TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
* Hook to specialize the Wait Strategy
*/
//@@ TAO_WAIT_STRATEGY_SPL_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 88e80011167..b8f9f1c81a5 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -24,6 +24,9 @@
#include "tao/TAO_Export.h"
class ACE_Time_Value;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
class TAO_ORB_Core;
class TAO_Transport;
class TAO_Synch_Reply_Dispatcher;
@@ -91,6 +94,8 @@ protected:
int is_registered_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "Wait_Strategy.inl"
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index ef388ec4f64..746c1d5ef4c 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -24,13 +24,14 @@
#include "tao/Resource_Factory.h"
+class ACE_Reactor_Impl;
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_Object_Adapter;
class TAO_IOR_Parser;
class TAO_LF_Strategy;
class TAO_Codeset_Descriptor_Base;
-class ACE_Reactor_Impl;
/**
* @class TAO_Default_Resource_Factory
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 7da35340277..8aed6ee5199 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -15,6 +15,8 @@ ACE_RCSID (tao,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_ORB_Parameters::TAO_ORB_Parameters (void)
: endpoints_map_ (10)
, mcast_discovery_endpoint_ ()
@@ -302,3 +304,5 @@ TAO_ORB_Parameters::connect_ipv6_only (void) const
return this->connect_ipv6_only_;
}
#endif /* ACE_HAS_IPV6 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index ef7593e3ab3..82310d30a61 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -24,8 +24,10 @@
#include "ace/SString.h"
-#include "objectid.h"
-#include "CORBA_String.h"
+#include "tao/objectid.h"
+#include "tao/CORBA_String.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Forward decls.
@@ -38,7 +40,6 @@
typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet;
typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
-
// -------------------------------------------------------------------
/**
@@ -313,6 +314,8 @@ private:
bool negotiate_codesets_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "tao/params.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 92a8a9e936a..9ebd0275f91 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -2,6 +2,8 @@
//
// $Id$
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE int
TAO_ORB_Parameters::sock_rcvbuf_size (void) const
{
@@ -228,3 +230,5 @@ TAO_ORB_Parameters::negotiate_codesets (bool x)
{
this->negotiate_codesets_ = x;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h
index f2ba8aea77f..58b1a595c87 100644
--- a/TAO/tao/varbase.h
+++ b/TAO/tao/varbase.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -17,6 +17,10 @@
#define TAO_VARBASE_H
#include /**/ "ace/pre.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_Base_var
*
@@ -39,5 +43,7 @@ private:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_VARBASE_H */