diff options
209 files changed, 920 insertions, 39 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ce3ad7771a6..ebb90255df3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,216 @@ +Thu Nov 24 03:01:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h: + * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp: + * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp: + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: + * orbsvcs/orbsvcs/Notify/Refcountable.cpp: + * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h: + * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp: + * orbsvcs/orbsvcs/Security/Security_Current.h: + * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h: + * orbsvcs/orbsvcs/Trader/Constraint_l.cpp: + * orbsvcs/orbsvcs/Trader/Trader.cpp: + * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h: + * tao/Acceptor_Registry.h: + * tao/Asynch_Reply_Dispatcher_Base.h: + * tao/BooleanSeqC.cpp: + * tao/BooleanSeqC.h: + * tao/CDR.h: + * tao/CONV_FRAMEC.cpp: + * tao/CONV_FRAMEC.h: + * tao/CORBA_methods.h: + * tao/CharSeqC.cpp: + * tao/CharSeqC.h: + * tao/Client_Strategy_Factory.h: + * tao/Codeset_Manager.h: + * tao/Codeset_Translator_Base.h: + * tao/Collocation_Strategy.h: + * tao/Condition.h: + * tao/Connect_Strategy.h: + * tao/Connection_Handler.h: + * tao/Connection_Handler.inl: + * tao/Connector_Impl.h: + * tao/CurrentC.cpp: + * tao/CurrentC.h: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/DomainC.inl: + * tao/DoubleSeqC.cpp: + * tao/DoubleSeqC.h: + * tao/Exception.h: + * tao/Fault_Tolerance_Service.h: + * tao/FlResource_Factory.h: + * tao/FloatSeqC.cpp: + * tao/FloatSeqC.h: + * tao/Flushing_Strategy.h: + * tao/GIOPC.cpp: + * tao/GIOPC.h: + * tao/GIOPC.inl: + * tao/GIOP_Utils.h: + * tao/GUIResource_Factory.h: + * tao/IIOPC.cpp: + * tao/IIOPC.h: + * tao/IIOP_EndpointsC.cpp: + * tao/IIOP_EndpointsC.h: + * tao/IIOP_Lite_Factory.cpp: + * tao/IOPC.cpp: + * tao/IOPC.h: + * tao/IOP_IORC.cpp: + * tao/IOP_IORC.h: + * tao/IORInterceptor_Adapter.h: + * tao/Incoming_Message_Queue.h: + * tao/Invocation_Adapter.h: + * tao/Invocation_Endpoint_Selectors.h: + * tao/LF_Connect_Strategy.h: + * tao/LF_Strategy.h: + * tao/Leader_Follower.h: + * tao/LocateRequest_Invocation_Adapter.h: + * tao/LongDoubleSeqC.cpp: + * tao/LongDoubleSeqC.h: + * tao/LongLongSeqC.cpp: + * tao/LongLongSeqC.h: + * tao/LongSeqC.cpp: + * tao/LongSeqC.h: + * tao/Messaging_PolicyValueC.cpp: + * tao/Messaging_PolicyValueC.h: + * tao/Messaging_SyncScopeC.cpp: + * tao/Messaging_SyncScopeC.h: + * tao/ORBInitializer_Registry.h: + * tao/ORB_Core.h: + * tao/Object.h: + * tao/ObjectIdListC.cpp: + * tao/ObjectIdListC.h: + * tao/Object_KeyC.cpp: + * tao/Object_KeyC.h: + * tao/OctetSeqC.cpp: + * tao/OctetSeqC.h: + * tao/PI_ForwardC.cpp: + * tao/PI_ForwardC.h: + * tao/ParameterModeC.cpp: + * tao/ParameterModeC.h: + * tao/Pluggable_Messaging.h: + * tao/PolicyC.cpp: + * tao/PolicyC.h: + * tao/PolicyC.inl: + * tao/Policy_Current.h: + * tao/Policy_ForwardC.cpp: + * tao/Policy_ForwardC.h: + * tao/PortableInterceptorC.cpp: + * tao/PortableInterceptorC.h: + * tao/Profile.h: + * tao/Profile_Transport_Resolver.cpp: + * tao/Profile_Transport_Resolver.h: + * tao/Queued_Message.h: + * tao/Reactive_Connect_Strategy.h: + * tao/Resource_Factory.h: + * tao/Sequence.h: + * tao/ServicesC.cpp: + * tao/ServicesC.h: + * tao/ShortSeqC.cpp: + * tao/ShortSeqC.h: + * tao/StringSeqC.cpp: + * tao/StringSeqC.h: + * tao/Synch_Invocation.h: + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/TAO_Internal.h: + * tao/TAO_Server_Request.h: + * tao/TAO_Singleton_Manager.cpp: + * tao/TAO_Singleton_Manager.h: + * tao/Thread_Lane_Resources.h: + * tao/TimeBaseC.cpp: + * tao/TimeBaseC.h: + * tao/Transport_Acceptor.h: + * tao/Transport_Cache_Manager.h: + * tao/Transport_Connector.h: + * tao/Transport_Mux_Strategy.h: + * tao/Transport_Queueing_Strategies.h: + * tao/TypeCodeFactory_Adapter.h: + * tao/Typecode_typesC.cpp: + * tao/Typecode_typesC.h: + * tao/ULongLongSeqC.cpp: + * tao/ULongLongSeqC.h: + * tao/ULongSeqC.cpp: + * tao/ULongSeqC.h: + * tao/UShortSeqC.cpp: + * tao/UShortSeqC.h: + * tao/VarOut_T.cpp: + * tao/Var_Size_Argument_T.inl: + * tao/Versioned_Namespace.h: + * tao/WCharSeqC.cpp: + * tao/WCharSeqC.h: + * tao/WStringSeqC.cpp: + * tao/WStringSeqC.h: + * tao/Wait_Strategy.h: + * tao/WrongTransactionC.cpp: + * tao/WrongTransactionC.h: + * tao/default_resource.h: + * tao/orb_typesC.cpp: + * tao/orb_typesC.h: + * tao/target_specification.h: + * tao/target_specification.i: + * tao/AnyTypeCode/AnySeqA.cpp: + * tao/AnyTypeCode/AnySeqA.h: + * tao/AnyTypeCode/AnySeqC.cpp: + * tao/AnyTypeCode/AnySeqC.h: + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp: + * tao/AnyTypeCode/Any_Impl.h: + * tao/AnyTypeCode/Any_Impl_T.h: + * tao/AnyTypeCode/Any_Impl_T.inl: + * tao/AnyTypeCode/Any_Unknown_IDL_Type.h: + * tao/AnyTypeCode/BooleanSeqA.cpp: + * tao/AnyTypeCode/BooleanSeqA.h: + * tao/AnyTypeCode/BoundsA.cpp: + * tao/AnyTypeCode/BoundsA.h: + * tao/AnyTypeCode/BoundsC.cpp: + * tao/AnyTypeCode/BoundsC.h: + * tao/AnyTypeCode/CONV_FRAMEA.cpp: + * tao/AnyTypeCode/CONV_FRAMEA.h: + * tao/AnyTypeCode/DynamicC.cpp: + * tao/AnyTypeCode/DynamicC.h: + * tao/AnyTypeCode/Dynamic_ParameterC.cpp: + * tao/AnyTypeCode/Dynamic_ParameterC.h: + * tao/AnyTypeCode/OctetSeqA.cpp: + * tao/AnyTypeCode/OctetSeqA.h: + * tao/AnyTypeCode/TypeCode_CDR_Extraction.h: + * tao/AnyTypeCode/ValueModifierC.cpp: + * tao/AnyTypeCode/ValueModifierC.h: + * tao/AnyTypeCode/VisibilityC.cpp: + * tao/AnyTypeCode/VisibilityC.h: + * tao/BiDir_GIOP/BiDirPolicyC.cpp: + * tao/BiDir_GIOP/BiDirPolicyC.h: + * tao/CodecFactory/IOP_CodecC.cpp: + * tao/CodecFactory/IOP_CodecC.h: + * tao/CodecFactory/IOP_Codec_includeC.h: + * tao/Codeset/Codeset_Translator_Factory.h: + * tao/DynamicInterface/DII_Invocation_Adapter.cpp: + * tao/DynamicInterface/DII_Invocation_Adapter.h: + * tao/Messaging/AMH_Response_Handler.h: + * tao/Messaging/Asynch_Invocation.h: + * tao/Messaging/Asynch_Invocation_Adapter.h: + * tao/Messaging/Asynch_Reply_Dispatcher.h: + * tao/Messaging/Connection_Timeout_Policy_i.h: + * tao/PI/ClientRequestInfo.cpp: + * tao/PI/ClientRequestInfoC.h: + * tao/PI/ClientRequestInterceptorC.h: + * tao/PortableServer/IdUniquenessStrategyUnique.h: + * tao/PortableServer/Key_Adapters.h: + * tao/PortableServer/Servant_Dispatcher.cpp: + * tao/PortableServer/Servant_Dispatcher.h: + * tao/Utils/Synch_Refcountable.h: + * tao/Valuetype/Valuetype_Adapter_Impl.h: + + Corrected build errors in versioned namespace builds. + Wed Nov 23 22:24:38 2005 Chris Cleeland <cleeland_c@ociweb.com> * orbsvcs/orbsvcs/Notify/Event_Manager.h: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index bd9c7b54e10..ead311f77b0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -26,7 +26,7 @@ // **************************************************************** -// $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CEC_TypedEvent diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp index a3b00d9800c..6df9adc7de1 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp @@ -523,6 +523,8 @@ static void yy_pop_state YY_PROTO(( void )); static int yy_top_state YY_PROTO(( void )); #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #else #define YY_NO_PUSH_STATE 1 #define YY_NO_POP_STATE 1 @@ -620,6 +622,8 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + YY_DECL { register yy_state_type yy_current_state; diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp index 923f6bccda0..252bee65b58 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp @@ -81,8 +81,12 @@ static void yyerror (const char *) // Ignore error messages } +TAO_END_VERSIONED_NAMESPACE_DECL + #include <stdio.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #ifndef __cplusplus #ifndef __STDC__ #define const @@ -326,6 +330,8 @@ static const short yycheck[] = { 17, It was written by Richard Stallman by simplifying the hairy parser used when %semantic_parser is specified. */ +TAO_END_VERSIONED_NAMESPACE_DECL + #ifndef YYSTACK_USE_ALLOCA #ifdef alloca #define YYSTACK_USE_ALLOCA @@ -426,6 +432,8 @@ while (0) #endif /* not YYLSP_NEEDED */ #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* If nonreentrant, generate the variables here */ #ifndef YYPURE diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i index bf487ec522a..e93998fee0f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i @@ -113,11 +113,15 @@ TAO_EC_Shutdown_Command<T>::execute (ACE_ENV_SINGLE_ARG_DECL) //*************************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + // Life would be much easier if _add_ref() and _remove_ref() // had throw specs of "throw ()" #include <algorithm> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class T> ACE_INLINE TAO_EC_Servant_Var<T>:: TAO_EC_Servant_Var(T * p) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i index ca16bf8aeec..c64085ea2e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_EC_ProxyPushSupplier::suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index 6042643f223..21a567e39ee 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -23,7 +23,8 @@ #endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_FT_Request_Duration_Policy * diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index cb454447a22..2e783eeaccb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -40,8 +40,12 @@ private: ACE_Reactor* reactor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include "FTEC_Group_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <ACE_PEER_STREAM_1> class ConnectionDetectHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> { diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index ba5804310ae..e510a9d0ebf 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -14,7 +14,7 @@ ACE_RCSID (HTIOP, static const char the_prefix[] = "htiop"; -TAO_END_VERSIONED_NAMESPACE_DECL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Protocol_Factory::Protocol_Factory (void) : TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE), diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index 32feb82dd2f..6a525695057 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -226,6 +226,7 @@ private: // The monitor we're wrapping. }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "Metrics_UpcallMonitor.i" @@ -233,6 +234,8 @@ private: #include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Metrics_UpcallMonitorAdapter<ACE_SYNCH_MUTEX, ACE_New_Allocator> TAO_METRICS_MONITOR_ADAPTER_TYPE; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index be50bc6eb2d..d09957d3af7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1456,7 +1456,12 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many, } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include "Naming_Service_Container.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index 17a96f95e86..874d67d7da8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -8,14 +8,14 @@ ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) #include <map> #include <string> #include <typeinfo.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Tracker * @@ -247,6 +247,6 @@ TAO_Notify_Tracker::find( const TAO_Notify_Refcountable* p ) const return e; } -#endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */ - TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index ed9322e2b17..9248676b9a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -25,6 +25,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 0eed6f21d92..cf9962182fd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -24,6 +24,14 @@ #include "tao/Versioned_Namespace.h" +///////////////////////////////// +// Includes needed by this header +#include "portablegroup_export.h" +#include "orbsvcs/PortableGroupS.h" +#include "ace/Hash_Map_Manager.h" +#include "ace/SString.h" +#include "ace/Null_Mutex.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////////////////// @@ -33,14 +41,6 @@ namespace TAO class PG_FactoryRegistry; } -///////////////////////////////// -// Includes needed by this header -#include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/SString.h" -#include "ace/Null_Mutex.h" - ///////////////////// // Forward references diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 82f8af77782..6b99b964ba7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -246,10 +246,14 @@ int TAO::PG_Property_Set::find ( return found; } +TAO_END_VERSIONED_NAMESPACE_DECL + //#define PG_PS_UNIT_TEST #ifdef PG_PS_UNIT_TEST #include "PG_Properties_Encoder.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_PG::test_encode_decode () { int result = 1; @@ -350,6 +354,7 @@ int TAO_PG::test_encode_decode () return result; } -#endif // PG_PS_UNIT_TEST TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // PG_PS_UNIT_TEST diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 8f537287407..b109d14ab56 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -1081,5 +1081,6 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, return 1; } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_RECONFIG_SCHED_UTILS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index e073d62a74a..0f450984d07 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -134,6 +134,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Security_Current.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 8e192bd393d..9bbba2e8755 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -87,8 +87,12 @@ public: virtual int visit_property (TAO_Property_Constraint* literal) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include "orbsvcs/Trader/Constraint_Nodes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Constraint_Validator * diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 2e56f8e62d2..ac70a799402 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -490,6 +490,8 @@ static int yy_top_state YY_PROTO(( void )); #define YY_NO_TOP_STATE 1 #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else @@ -581,6 +583,8 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + YY_DECL { register yy_state_type yy_current_state; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 49dbba67957..769c5485231 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -634,9 +634,13 @@ operator== (const CosTrading::Admin::OctetSeq& left, return return_value; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include "ace/Arg_Shifter.h" #include "Trader_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Trader_Factory::TAO_TRADER* TAO_Trader_Factory::create_trader (int& argc, ACE_TCHAR** argv) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index dafadb93588..9ae04cb0df1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -41,8 +41,12 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Admin; template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Proxy; template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Link; +TAO_END_VERSIONED_NAMESPACE_DECL + #include "Trader_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Lookup * diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 776ba261bbe..7d7bee02a2d 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -27,8 +27,10 @@ #include "tao/Exception.h" #include "tao/params.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Addr; class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqA.cpp b/TAO/tao/AnyTypeCode/AnySeqA.cpp index 4b87880c61f..4c1e7a8cc17 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqA.h b/TAO/tao/AnyTypeCode/AnySeqA.h index 16f1b2288f1..644c4af252f 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.h +++ b/TAO/tao/AnyTypeCode/AnySeqA.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { // TAO_IDL - Generated from @@ -91,6 +93,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/AnySeqC.cpp b/TAO/tao/AnyTypeCode/AnySeqC.cpp index f04c69e6e47..c196a0061f1 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -169,3 +171,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqC.h b/TAO/tao/AnyTypeCode/AnySeqC.h index 12b744d0be4..bb18f8e402a 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.h +++ b/TAO/tao/AnyTypeCode/AnySeqC.h @@ -67,6 +67,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -164,6 +166,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 90199306ded..e64ed67897c 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -10,7 +10,7 @@ ACE_RCSID (AnyTypeCode, TAO_AnyTypeCode_Adapter, "$Id$") -TAO_END_VERSIONED_NAMESPACE_DECL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define STANDARD_EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 7765368325d..9eaf83b482d 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -31,7 +31,9 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Block; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index d79c5ce2135..bddd912ecc9 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -70,6 +72,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Impl_T.inl" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Impl_T.inl index 1bbeebeea78..3b5b36ab5ed 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl @@ -1,6 +1,9 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // These three are overridden in generated code where appropriate. template<typename T> @@ -51,3 +54,4 @@ TAO::Any_Impl_T<T>::value (void) const return this->value_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index eae32d55ae4..8a59bee86b0 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -25,8 +25,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp index 051cf1ea18d..8d3cc5f1e67 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.h b/TAO/tao/AnyTypeCode/BooleanSeqA.h index e621d14fd31..9797a2afa66 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.h +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.h @@ -37,6 +37,8 @@ #include "tao/BooleanSeqC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::BooleanSeq*); / TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::BooleanSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::BooleanSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/BoundsA.cpp b/TAO/tao/AnyTypeCode/BoundsA.cpp index 097395f4667..7b732bb6a31 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.cpp +++ b/TAO/tao/AnyTypeCode/BoundsA.cpp @@ -35,6 +35,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -145,3 +147,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BoundsA.h b/TAO/tao/AnyTypeCode/BoundsA.h index c3f5f3658a2..ed91bde89f4 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.h +++ b/TAO/tao/AnyTypeCode/BoundsA.h @@ -62,6 +62,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -145,6 +147,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/BoundsC.cpp b/TAO/tao/AnyTypeCode/BoundsC.cpp index fec4453680a..e91e8fe16e2 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.cpp +++ b/TAO/tao/AnyTypeCode/BoundsC.cpp @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -171,3 +173,5 @@ CORBA::Boolean operator>> ( { return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BoundsC.h b/TAO/tao/AnyTypeCode/BoundsC.h index b228461b7b0..68a4721e7dc 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.h +++ b/TAO/tao/AnyTypeCode/BoundsC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -131,6 +133,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp index e93d7b8e7f7..4d410922070 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -425,3 +427,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h index cbc76dd89aa..beffd197c43 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CONV_FRAME { @@ -106,6 +108,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContex TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp index 3b045863a7a..a6ef9567128 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.cpp +++ b/TAO/tao/AnyTypeCode/DynamicC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -301,3 +303,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h index 76b095d02f0..0bdd3a59057 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.h +++ b/TAO/tao/AnyTypeCode/DynamicC.h @@ -70,6 +70,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -251,6 +253,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp index b681433ed5e..6d81b22763f 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -80,3 +82,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.argument) && (strm >> _tao_aggregate.mode); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h index 1647bfc6b91..e5533c2b7dc 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Dynamic { @@ -121,6 +123,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Param // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp index 66b18534bb1..b7ca2bd3f1b 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.cpp +++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h index 159132d2448..8b94976cb20 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.h +++ b/TAO/tao/AnyTypeCode/OctetSeqA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h index 6856c537e7a..0e6d6015c97 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h @@ -23,8 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - +ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> class ACE_Array_Base; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.cpp b/TAO/tao/AnyTypeCode/ValueModifierC.cpp index 76644c8b3c0..de4da3c7377 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierC.cpp @@ -39,8 +39,11 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.h b/TAO/tao/AnyTypeCode/ValueModifierC.h index 2bfe5a25b4e..424e4e3b61b 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.h +++ b/TAO/tao/AnyTypeCode/ValueModifierC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -106,6 +108,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/VisibilityC.cpp b/TAO/tao/AnyTypeCode/VisibilityC.cpp index 76f74d94f2f..0fb49012231 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityC.cpp @@ -39,8 +39,11 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/VisibilityC.h b/TAO/tao/AnyTypeCode/VisibilityC.h index 124188ba2f7..4f6e607ba23 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.h +++ b/TAO/tao/AnyTypeCode/VisibilityC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -96,6 +98,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index fc1840178b0..671c188a325 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -25,9 +25,11 @@ #include "tao/IOP_IORC.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; class ACE_Lock; class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 93db9790b38..171504cd4e7 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -182,3 +184,5 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index 0baa3c73cee..b6c8a1c5647 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -69,6 +69,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace BiDirPolicy { @@ -244,6 +246,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index 94f67041501..5d4f05119ce 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ void CORBA::BooleanSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h index 61901510719..58218300078 100644 --- a/TAO/tao/BooleanSeqC.h +++ b/TAO/tao/BooleanSeqC.h @@ -52,6 +52,8 @@ #endif #define TAO_EXPORT_MACRO TAO_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -139,6 +141,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index d06f563a582..4d48529f523 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -287,10 +287,14 @@ private: TAO_ORB_Core* orb_core_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) # include "tao/CDR.i" #else +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // CDR output operators for CORBA types TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, @@ -340,9 +344,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Char* &x); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::WChar* &x); -#endif /* __ACE_INLINE */ TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* __ACE_INLINE */ + #include /**/ "ace/post.h" #endif /* TAO_CDR_H */ diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 11d54fd3b16..f7036582853 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -259,3 +261,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.char_data) && (strm >> _tao_aggregate.wchar_data); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index 798e0fa4261..8e76fe5ec34 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CONV_FRAME { @@ -256,6 +258,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h index 038f912b6e2..62d95e56a1e 100644 --- a/TAO/tao/CORBA_methods.h +++ b/TAO/tao/CORBA_methods.h @@ -30,6 +30,8 @@ #endif #define TAO_EXPORT_MACRO TAO_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class ORB; @@ -77,6 +79,8 @@ namespace CORBA TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr); } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CORBA_METHODS_H */ diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index 7ed29c4865a..69b75db6242 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ void CORBA::CharSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h index 4e7d783a866..39ead7275b3 100644 --- a/TAO/tao/CharSeqC.h +++ b/TAO/tao/CharSeqC.h @@ -52,6 +52,8 @@ #endif #define TAO_EXPORT_MACRO TAO_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -139,6 +141,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index d83b0c542e9..3c63290ad4a 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -26,8 +26,9 @@ #include "ace/Service_Object.h" - +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/IOP_CodecC.cpp b/TAO/tao/CodecFactory/IOP_CodecC.cpp index e565c342595..552e7be42a3 100644 --- a/TAO/tao/CodecFactory/IOP_CodecC.cpp +++ b/TAO/tao/CodecFactory/IOP_CodecC.cpp @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1198,3 +1200,5 @@ void operator<<= ( (strm >> _tao_aggregate.char_codeset) && (strm >> _tao_aggregate.wchar_codeset); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h index 70002145acc..d8d3679abf0 100644 --- a/TAO/tao/CodecFactory/IOP_CodecC.h +++ b/TAO/tao/CodecFactory/IOP_CodecC.h @@ -70,6 +70,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace IOP { @@ -739,8 +741,8 @@ TAO_CodecFactory_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encodi // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ - - diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h index d8ff3d1e3b6..dae38bfa7b4 100644 --- a/TAO/tao/CodecFactory/IOP_Codec_includeC.h +++ b/TAO/tao/CodecFactory/IOP_Codec_includeC.h @@ -53,11 +53,15 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { } +TAO_END_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_codegen.cpp:1040 diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 4e1d0672480..1440bccd9ca 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -25,8 +25,10 @@ #include "codeset_export.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h index 772fc1c8e75..163014327b1 100644 --- a/TAO/tao/Codeset_Manager.h +++ b/TAO/tao/Codeset_Manager.h @@ -25,7 +25,9 @@ #include "tao/CONV_FRAMEC.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_WChar_Codeset_Translator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h index 6e1b071fa01..c2af91a7522 100644 --- a/TAO/tao/Codeset_Translator_Base.h +++ b/TAO/tao/Codeset_Translator_Base.h @@ -25,8 +25,10 @@ #include "tao/Codeset_Translator_Base.h" #include "ace/Service_Object.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Strategy.h b/TAO/tao/Collocation_Strategy.h index 9a6e4927b52..236149a387b 100644 --- a/TAO/tao/Collocation_Strategy.h +++ b/TAO/tao/Collocation_Strategy.h @@ -14,6 +14,10 @@ #define TAO_COLLOCATION_STRATEGY_H #include /**/ "ace/pre.h" +#include "tao/orbconf.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Define symbolic names for the ORB collocation strategies. namespace TAO @@ -37,6 +41,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_COLLOCATION_STRATEGY_H */ diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index a7eed8c3df3..2d5afdbfc9b 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -24,7 +24,9 @@ #include "ace/Condition_T.h" #include "ace/Global_Macros.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h index 97ba8b87066..1189a6cd171 100644 --- a/TAO/tao/Connect_Strategy.h +++ b/TAO/tao/Connect_Strategy.h @@ -23,8 +23,10 @@ #include "tao/Versioned_Namespace.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Synch_Options; class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 2ff6a96c82e..e17ff6af08f 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -23,9 +23,11 @@ #include "tao/Basic_Types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SOCK; class ACE_Lock; class ACE_Event_Handler; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index 77ff81df46d..5841cf3aebc 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -2,6 +2,8 @@ // //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ORB_Core * TAO_Connection_Handler::orb_core (void) { diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index 8ad9f41fcd8..6affe0860e6 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -22,7 +22,9 @@ #include "tao/Basic_Types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Thread_Manager; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 5b38d3dae99..7fa060482db 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -162,3 +164,5 @@ CORBA::Current::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index e23843d6261..e102b492f15 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -59,6 +59,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -183,6 +185,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index edc3ef28c7c..d28bb2b7f00 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -54,6 +54,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO specific stuff. namespace CORBA { @@ -735,3 +737,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 5a4683f1b2a..f09fd9758c1 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -66,6 +66,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -478,6 +480,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "DomainC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/DomainC.inl b/TAO/tao/DomainC.inl index 59264e65404..d46727c0132 100644 --- a/TAO/tao/DomainC.inl +++ b/TAO/tao/DomainC.inl @@ -29,6 +29,8 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if !defined (_CORBA_DOMAINMANAGER___CI_) #define _CORBA_DOMAINMANAGER___CI_ @@ -97,3 +99,5 @@ CORBA::ConstructionPolicy::ConstructionPolicy ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index e70ae2285d4..a41b7664f0f 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ void CORBA::DoubleSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h index 01164cc055d..06e04f48497 100644 --- a/TAO/tao/DoubleSeqC.h +++ b/TAO/tao/DoubleSeqC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -139,6 +141,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index cadf68653ce..b44347d3158 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -18,6 +18,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { DII_Invocation_Adapter::DII_Invocation_Adapter (CORBA::Object *target, @@ -181,3 +183,5 @@ namespace TAO return status; } } // End namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index 18d783edaff..d80f9900855 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -22,9 +22,14 @@ #include "tao/Invocation_Adapter.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Operation_Details; class TAO_Stub; -class ACE_Time_Value; class TAO_ORB_Core; class TAO_DII_Deferred_Reply_Dispatcher; namespace CORBA @@ -158,6 +163,7 @@ namespace TAO }; } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_INVOCATION_ADAPTER_H*/ diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index bd07824a27a..3d6a605bdab 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -39,7 +39,9 @@ #include "ace/iosfwd.h" #include "ace/CORBA_macros.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index e8877d04f23..39e2799754f 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -28,7 +28,9 @@ #include "tao/Basic_Types.h" #include "ace/SString.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource_Factory.h index d4eddd7c36d..bee03bc81f4 100644 --- a/TAO/tao/FlResource_Factory.h +++ b/TAO/tao/FlResource_Factory.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index 311d83e4867..d8e51057f79 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ void CORBA::FloatSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h index 09fa2f459a7..dbab855a3b4 100644 --- a/TAO/tao/FloatSeqC.h +++ b/TAO/tao/FloatSeqC.h @@ -52,6 +52,8 @@ #endif #define TAO_EXPORT_MACRO TAO_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -139,6 +141,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h index ad351745d4d..ead55aec8f2 100644 --- a/TAO/tao/Flushing_Strategy.h +++ b/TAO/tao/Flushing_Strategy.h @@ -21,7 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index c969f09d9c0..99f4c435e1c 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -385,3 +387,5 @@ CORBA::Boolean operator>> ( return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index e85e137e6c0..aad096b072f 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -57,6 +57,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -265,6 +267,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "GIOPC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/GIOPC.inl b/TAO/tao/GIOPC.inl index a4780ad16c0..d83b70b3c5b 100644 --- a/TAO/tao/GIOPC.inl +++ b/TAO/tao/GIOPC.inl @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_union/discriminant_ci.cpp:164 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void GIOP::TargetAddress::_default () @@ -157,3 +159,5 @@ GIOP::TargetAddress::ior (void) { return *this->u_.ior_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h index 7cbb8c1bb71..392e73aafe8 100644 --- a/TAO/tao/GIOP_Utils.h +++ b/TAO/tao/GIOP_Utils.h @@ -27,7 +27,9 @@ #include "tao/IOP_IORC.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index 8ee34e12976..134f8bfa88a 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -26,8 +26,10 @@ #include "ace/Thread_Mutex.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor_Impl; class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 6bb33006503..46c1cce05ed 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -32,6 +32,8 @@ #include "IIOPC.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 @@ -235,3 +237,5 @@ CORBA::Boolean operator>> ( return (strm >> _tao_aggregate.listen_points); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index 18133b7e39a..69fd036e067 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -58,6 +58,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -216,6 +218,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index 819ea3f62b6..d06e6eac543 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -207,3 +209,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h index 2b780ea4150..6abf0ddb7e4 100644 --- a/TAO/tao/IIOP_EndpointsC.h +++ b/TAO/tao/IIOP_EndpointsC.h @@ -65,6 +65,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -186,6 +188,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp index ba17a7c0c51..65157f45b23 100644 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ b/TAO/tao/IIOP_Lite_Factory.cpp @@ -13,6 +13,8 @@ ACE_RCSID (tao, static const char the_prefix[] = "iiop"; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), major_ (TAO_DEF_GIOP_MAJOR), diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index b5108933284..6774ddcb1e1 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -35,8 +35,12 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index e0bbb0a432a..aa18c7b441b 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -56,6 +56,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 @@ -67,6 +69,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 0dcb0c1062d..2090ea94b73 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -810,3 +812,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index 4bf5d87e8d1..c0f8910c5e8 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -60,6 +60,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -724,6 +726,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index a108c92130e..587b3e8f902 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -25,7 +25,9 @@ #include "tao/SystemException.h" #include "tao/PI_ForwardC.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> class ACE_Array_Base; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index e5414003137..3d476b7bc29 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -22,7 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 5cae0020013..8c3fe6e791b 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -29,7 +29,9 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index fed8b3426b5..29b5580d88a 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -28,7 +28,9 @@ #include "ace/CORBA_macros.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h index 33e071a5d7d..4ff1c8e1fbd 100644 --- a/TAO/tao/LF_Connect_Strategy.h +++ b/TAO/tao/LF_Connect_Strategy.h @@ -21,8 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; class ACE_Synch_Options; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h index 2b0daf54ece..782821a2542 100644 --- a/TAO/tao/LF_Strategy.h +++ b/TAO/tao/LF_Strategy.h @@ -23,7 +23,9 @@ #include "tao/Versioned_Namespace.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 8c7eb2adb45..46fa3c312a7 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -28,7 +28,9 @@ #include "ace/Intrusive_List_Node.h" #include "ace/OS_NS_Thread.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h index dec5597f6e8..cfed80c24fc 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.h +++ b/TAO/tao/LocateRequest_Invocation_Adapter.h @@ -20,9 +20,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 0e1dd30f277..200390bb76d 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -155,3 +157,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h index 87a2dcaab12..8c5eebed71f 100644 --- a/TAO/tao/LongDoubleSeqC.h +++ b/TAO/tao/LongDoubleSeqC.h @@ -61,6 +61,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -148,6 +150,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index d0142375188..ffb82e048b9 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -155,3 +157,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h index 78c8d8223b9..13e708a51ad 100644 --- a/TAO/tao/LongLongSeqC.h +++ b/TAO/tao/LongLongSeqC.h @@ -61,6 +61,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -148,6 +150,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index fcb07e3e606..8c40c6bf9bb 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -155,3 +157,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h index 4fd2f60e996..98d23f21266 100644 --- a/TAO/tao/LongSeqC.h +++ b/TAO/tao/LongSeqC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -148,6 +150,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 82b74bc9258..06be64337b8 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -28,7 +28,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h index 6c02e475920..930d223bd3c 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.h +++ b/TAO/tao/Messaging/Asynch_Invocation.h @@ -25,7 +25,10 @@ #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index d3360037faf..97cc214a71d 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -29,7 +29,9 @@ #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 35bdf9cb5df..2d08c925797 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -25,7 +25,9 @@ #include "Asynch_Timeout_Handler.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 9d84d79f2a8..1bbfad80023 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -32,6 +32,8 @@ #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* * @class TAO_ConnectionTimeoutPolicy * diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 3bb08c79911..1cfb6fa1707 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -206,3 +208,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index abe0c4f2eb5..9b48af9e2e6 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -194,6 +196,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index b515509a832..3a1bd37b406 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -39,8 +39,12 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index 61b17540188..4658f3d4e02 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -106,6 +108,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 0864d35f125..677e4c50436 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -41,7 +41,7 @@ namespace PortableInterceptor ); } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 19fee62636a..00da0667814 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -42,7 +42,9 @@ #include "ace/Lock_Adapter_T.h" #include "ace/TSS_T.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Data_Block; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index c0710a24d6d..4805cc006aa 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -39,7 +39,9 @@ # undef IOR #endif /* HPUX && IOR */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index a46f7400069..470fa8d6fc0 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -155,3 +157,5 @@ return false; } #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h index 41ec5807c6d..034e9d43ea3 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -151,6 +153,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 3f46183a1f5..2ceb1720ec6 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -44,6 +44,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -331,3 +333,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 2198a47af4f..6e070fcbea2 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -173,6 +175,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index c59ead52d2b..430e3abb68e 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -188,3 +190,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index 5fa4471699b..341cc5ad84f 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -57,6 +57,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -165,6 +167,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index b78a8a21746..00f25e22d2c 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -748,6 +748,6 @@ TAO_ClientRequestInfo::tao_ft_retention_id (void) const return this->invocation_->operation_details ().ft_retention_id (); } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInfoC.h b/TAO/tao/PI/ClientRequestInfoC.h index c319d36b758..2a13b7eb472 100644 --- a/TAO/tao/PI/ClientRequestInfoC.h +++ b/TAO/tao/PI/ClientRequestInfoC.h @@ -62,6 +62,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -281,6 +283,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/ClientRequestInterceptorC.h b/TAO/tao/PI/ClientRequestInterceptorC.h index 57696fb4feb..840948b8b5a 100644 --- a/TAO/tao/PI/ClientRequestInterceptorC.h +++ b/TAO/tao/PI/ClientRequestInterceptorC.h @@ -58,6 +58,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -284,6 +286,9 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index a077461b82b..fb9f49e396c 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -40,8 +40,12 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h index 9738014449c..d8672822375 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -135,6 +137,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp index 3040509bd76..1716c9700fd 100644 --- a/TAO/tao/ParameterModeC.cpp +++ b/TAO/tao/ParameterModeC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -65,3 +67,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::ParameterMode & _tao_enum return _tao_success; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h index e2751ebf4e4..c4a0c7d670a 100644 --- a/TAO/tao/ParameterModeC.h +++ b/TAO/tao/ParameterModeC.h @@ -59,6 +59,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_InputCDR; class TAO_OutputCDR; @@ -99,6 +101,9 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 + +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h index 6520abad3a3..dd3aef59058 100644 --- a/TAO/tao/Pluggable_Messaging.h +++ b/TAO/tao/Pluggable_Messaging.h @@ -26,7 +26,9 @@ #include "tao/Basic_Types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 606c217d2bf..6b96a63bde5 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -50,6 +50,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO specific stuff. namespace CORBA { @@ -1038,3 +1040,5 @@ CORBA::Boolean operator>> ( return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 3346c12a828..8252340082d 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -65,6 +65,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -662,6 +664,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "PolicyC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl index 2bc9b36e2dc..3b97e162307 100644 --- a/TAO/tao/PolicyC.inl +++ b/TAO/tao/PolicyC.inl @@ -29,6 +29,8 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if !defined (_CORBA_POLICY___CI_) #define _CORBA_POLICY___CI_ @@ -61,3 +63,5 @@ CORBA::Policy::Policy ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h index 677b400cc66..889c1971d24 100644 --- a/TAO/tao/Policy_Current.h +++ b/TAO/tao/Policy_Current.h @@ -35,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Policy_Current_Impl; class TAO_Policy_Current @@ -75,6 +77,8 @@ public: TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index b056d46a8e3..7a313012ee6 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -303,3 +305,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::SetOverrideType & _tao_en return _tao_success; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 9d15b8a3cf2..3ad266dc05d 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -56,6 +56,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -330,6 +332,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 25d2f8334ff..7a227917ff1 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -35,8 +35,12 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index bf1b51c4d81..f9edc88992e 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -52,6 +52,8 @@ #endif #define TAO_EXPORT_MACRO TAO_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -129,6 +131,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index b48b840cf3f..31a4d382a98 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -23,6 +23,8 @@ #include "IdUniquenessStrategy.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index 18d256bfbbf..aa8f6bf17aa 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -23,7 +23,9 @@ #include "PS_ForwardC.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Active_Map_Manager_Key; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index abe28052f0c..fc047801bed 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -12,3 +12,5 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index 4ba8c3c4200..3b415dac5f8 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -23,7 +23,9 @@ #include "Servant_Upcall.h" #include "ace/SStringfwd.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 2da45bd1469..573c77e418d 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -25,7 +25,9 @@ #include "tao/Refcounted_ObjectKey.h" #include "tao/Service_Callbacks.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index cfb4a898e86..affc4e656dd 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -24,6 +24,7 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index d62171b8d91..cd1f9d3660c 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -25,7 +25,9 @@ #include "tao/SystemException.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index 29c28df9efb..d2b1ec6c888 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -23,8 +23,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ struct iovec; + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Block; class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h index c0c2a41dee7..305b5e9576e 100644 --- a/TAO/tao/Reactive_Connect_Strategy.h +++ b/TAO/tao/Reactive_Connect_Strategy.h @@ -21,8 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; class ACE_Synch_Options; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index a21a91684ea..200c070484d 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -29,7 +29,10 @@ #include "ace/SString.h" #include "ace/CDR_Base.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 1683a4da658..641a2c86f9d 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -25,7 +25,9 @@ #include "tao/orbconf.h" #include "tao/default_environment.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Block; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index 765d9c8e576..c9139e959b9 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -349,3 +351,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.service_options) && (strm >> _tao_aggregate.service_details); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index 5e24beb739a..524b9bef015 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -63,6 +63,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -314,6 +316,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index 5b4df566b26..5f215c64eff 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h index 79b6809bd5a..710cff4afb9 100644 --- a/TAO/tao/ShortSeqC.h +++ b/TAO/tao/ShortSeqC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -136,6 +138,8 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */ +TAO_END_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_codegen.cpp:1028 diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 5e3db1770bc..4bbe9b5461d 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -160,3 +162,5 @@ return false; } #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index 9cfebe0ca70..85a6e6bb5ac 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -137,6 +139,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 7707cfc35df..e3441f6b7be 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -22,7 +22,9 @@ #include "tao/SystemException.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 9ec2b85fff5..8016d25b4fd 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -206,3 +208,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.message_count) && (strm >> _tao_aggregate.message_bytes); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 72e9467c9ef..b417694122b 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -290,6 +292,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h index f814c3a8c2d..e528980821c 100644 --- a/TAO/tao/TAO_Internal.h +++ b/TAO/tao/TAO_Internal.h @@ -17,12 +17,14 @@ #include /**/ "ace/pre.h" -#include "ace/config-all.h" +#include "tao/orbconf.h" +#include "tao/Versioned_Namespace.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -63,6 +65,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index b2013c267f1..7c410acc66e 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -30,18 +30,24 @@ #include "tao/Service_Context.h" #include "tao/Object.h" +#if TAO_HAS_INTERCEPTORS == 1 + TAO_BEGIN_VERSIONED_NAMESPACE_DECL -#if TAO_HAS_INTERCEPTORS == 1 namespace TAO { class PICurrent; class PICurrent_Impl; class PICurrent_Copy_Callback; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include "PortableInterceptorC.h" + #endif /* TAO_HAS_INTERCEPTORS == 1 */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Pluggable_Messaging; class TAO_Transport; class TAO_AMH_Response_Handler; diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index f871ae6504d..2d5ecbb1971 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -28,9 +28,15 @@ ACE_RCSID (tao, TAO_Singleton_Manager, "$Id$") + extern "C" void -TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *) +TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *) { +#if defined (TAO_HAS_VERSIONED_NAMESPACE) \ + && TAO_HAS_VERSIONED_NAMESPACE == 1 + using namespace TAO_VERSIONED_NAMESPACE_NAME; +#endif /* TAO_HAS_VERSIONED_NAMESPACE */ + if (TAO_Singleton_Manager::instance_) { (void) TAO_Singleton_Manager::instance ()->fini (); @@ -187,7 +193,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager) if (register_with_object_manager == 1 && ACE_Object_Manager::at_exit ( this, - (ACE_CLEANUP_FUNC) TAO_Singleton_Manager_cleanup_destroyer, + (ACE_CLEANUP_FUNC) TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME, 0) != 0) return -1; diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 7e52b9e3630..3e8b3d729ad 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -34,11 +34,11 @@ // 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) +# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_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 +# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME TAO_Singleton_Manager_cleanup_destroyer #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ @@ -46,7 +46,7 @@ /// ACE_Object_Manager. extern "C" void -TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *); +TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *); TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -76,7 +76,7 @@ typedef void (*TAO_unexpected_handler)(void); class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base { - friend void TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *); + friend void ::TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *); public: /// Explicitly initialize. diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 307dee679bd..5d337b1f67e 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -26,7 +26,9 @@ #include "tao/orbconf.h" #include "params.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index aa5a1ecaaa7..b7597eecac3 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -120,3 +122,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.lower_bound) && (strm >> _tao_aggregate.upper_bound); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index a5846a67720..4ff35b6fd42 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -62,6 +62,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TimeBase { @@ -167,6 +169,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h index b27d43cdef3..53900953f54 100644 --- a/TAO/tao/Transport_Acceptor.h +++ b/TAO/tao/Transport_Acceptor.h @@ -27,8 +27,10 @@ #include "tao/Basic_Types.h" // Forward declarations. +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Addr; class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h index ac1ba979530..37a3643fe3e 100644 --- a/TAO/tao/Transport_Cache_Manager.h +++ b/TAO/tao/Transport_Cache_Manager.h @@ -25,9 +25,11 @@ #include "tao/Cache_Entries.h" #include "tao/orbconf.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Handle_Set; template <class T> class ACE_Unbounded_Set; template <class T> class ACE_Unbounded_Set_Iterator; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index e2ea0c77bbc..cddffaa5a49 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -26,7 +26,9 @@ #include "TAO_Export.h" #include "Basic_Types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 4d92a51c558..1dcc0f2ba11 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -23,7 +23,9 @@ #include "tao/Basic_Types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h index 4401663bdbb..56ba66149ee 100644 --- a/TAO/tao/Transport_Queueing_Strategies.h +++ b/TAO/tao/Transport_Queueing_Strategies.h @@ -27,7 +27,9 @@ #include "tao/orbconf.h" #include "tao/Basic_Types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 7c7c3a909c9..03bdcd4f455 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -24,7 +24,9 @@ #include "tao/Environment.h" #include "tao/Typecode_typesC.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> class ACE_Array_Base; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp index bff34272a23..d33a07dcac5 100644 --- a/TAO/tao/Typecode_typesC.cpp +++ b/TAO/tao/Typecode_typesC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -65,3 +67,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::TCKind & _tao_enumerator) return _tao_success; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index 3d411afc9e6..5c6dfd896d8 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -58,6 +58,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -133,6 +135,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index 9b7bed6d5f2..e5e5d7e195e 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ void CORBA::ULongLongSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h index 9210eeb57fe..b77ce3b7af6 100644 --- a/TAO/tao/ULongLongSeqC.h +++ b/TAO/tao/ULongLongSeqC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -139,6 +141,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index 8fc6a35358a..265c5cd30d6 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h index 07d71927c92..f0b8beb805d 100644 --- a/TAO/tao/ULongSeqC.h +++ b/TAO/tao/ULongSeqC.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -144,6 +146,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index 178d8264a70..22cd79be478 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -155,3 +157,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index 33567017495..883ac0591c2 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -160,6 +162,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Utils/Synch_Refcountable.h b/TAO/tao/Utils/Synch_Refcountable.h index 2c7ebf037bb..44a7bfdb516 100644 --- a/TAO/tao/Utils/Synch_Refcountable.h +++ b/TAO/tao/Utils/Synch_Refcountable.h @@ -25,7 +25,9 @@ #include "utils_export.h" #include "tao/Versioned_Namespace.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h index 5d63dba2df6..353ea51e4d0 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -26,6 +26,8 @@ #include "tao/Valuetype_Adapter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Valuetype_Adapter_Impl * diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp index b53bedc3a62..85a31f687e4 100644 --- a/TAO/tao/VarOut_T.cpp +++ b/TAO/tao/VarOut_T.cpp @@ -67,4 +67,6 @@ TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p) return *this; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_VAROUT_T_CPP */ diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index 909e94ffb1f..e20150b11c7 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename Insert_Policy> ACE_INLINE diff --git a/TAO/tao/Versioned_Namespace.h b/TAO/tao/Versioned_Namespace.h index d00bac83952..0e756f9d000 100644 --- a/TAO/tao/Versioned_Namespace.h +++ b/TAO/tao/Versioned_Namespace.h @@ -41,7 +41,7 @@ // performs the actual concatenation. # define TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) TAO_ ## MAJOR ## _ ## MINOR ## _ ## BETA # define TAO_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,BETA) TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) -# define TAO_VERSIONED_NAMESPACE_NAME ACE_MAKE_VERSIONED_NAMESPACE_NAME(TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION) +# define TAO_VERSIONED_NAMESPACE_NAME TAO_MAKE_VERSIONED_NAMESPACE_NAME(TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION) # endif /* !TAO_VERSIONED_NAMESPACE_NAME */ # define TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_VERSIONED_NAMESPACE_NAME { diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index 7ea50940e52..b4b2ae47b29 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -151,3 +153,5 @@ void CORBA::WCharSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h index 53b046ae900..387004f7c3c 100644 --- a/TAO/tao/WCharSeqC.h +++ b/TAO/tao/WCharSeqC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -139,6 +141,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index 1021460a5e3..068399c3217 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -160,3 +162,5 @@ return false; } #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h index 7a434302f87..04adbf29512 100644 --- a/TAO/tao/WStringSeqC.h +++ b/TAO/tao/WStringSeqC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -137,6 +139,8 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index b8f9f1c81a5..b7305766407 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -23,7 +23,9 @@ #include "tao/TAO_Export.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 3ca279cf001..f2f7d3683aa 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -43,6 +43,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -186,3 +188,5 @@ CORBA::Boolean operator>> ( { return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index a872bfdfaf2..e64c9dedb4d 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -131,6 +133,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &) // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 746c1d5ef4c..3aeeca52ab7 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -24,7 +24,9 @@ #include "tao/Resource_Factory.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor_Impl; +ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp index 168eeabc2fb..43f0899df80 100644 --- a/TAO/tao/orb_typesC.cpp +++ b/TAO/tao/orb_typesC.cpp @@ -35,8 +35,12 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h index 17a295fddf6..14555b5a451 100644 --- a/TAO/tao/orb_typesC.h +++ b/TAO/tao/orb_typesC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -103,6 +105,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1062 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 4a352a6b333..53b911a2281 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -35,6 +35,7 @@ # undef IOR #endif /* HPUX && IOR */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace IOP { @@ -127,6 +128,8 @@ private: CORBA::ULong profile_index_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "target_specification.i" #endif /* defined INLINE */ diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i index e427b1dd9be..dd1265bf0df 100644 --- a/TAO/tao/target_specification.i +++ b/TAO/tao/target_specification.i @@ -1,6 +1,8 @@ -//-*- C++ -*- +// -*- C++ -*- +// //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Target_Specification::TAO_Target_Specification (void) @@ -81,3 +83,5 @@ TAO_Target_Specification::specifier (void) { return this->specifier_; } + +TAO_END_VERSIONED_NAMESPACE_DECL |