diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-10 06:47:24 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-10 06:47:24 +0000 |
| commit | 1b6be8f5e2e7e445aaf70a493e04e7a6629614ff (patch) | |
| tree | 2b80a1f74f8eefbb01501abb551e57aefbc240fd | |
| parent | 9f6a1de034a521f9aebc481639856fcfd8d0620d (diff) | |
| download | ATCD-1b6be8f5e2e7e445aaf70a493e04e7a6629614ff.tar.gz | |
ChangeLogTag:Wed Nov 9 22:34:24 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
443 files changed, 2753 insertions, 924 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6fdf8209234..a8bf0867df5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,450 @@ +Wed Nov 9 22:34:24 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Channel_Clients_T.cpp: + * orbsvcs/orbsvcs/Channel_Clients_T.h: + * orbsvcs/orbsvcs/Channel_Clients_T.i: + * orbsvcs/orbsvcs/Event_Service_Constants.h: + * orbsvcs/orbsvcs/Event_Utilities.cpp: + * orbsvcs/orbsvcs/Event_Utilities.h: + * orbsvcs/orbsvcs/Event_Utilities.i: + * orbsvcs/orbsvcs/IOR_Multicast.cpp: + * orbsvcs/orbsvcs/IOR_Multicast.h: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/orbsvcs/RTEvent_Serv.mpc: + * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: + * orbsvcs/orbsvcs/Runtime_Scheduler.h: + * orbsvcs/orbsvcs/Shutdown_Utilities.cpp: + * orbsvcs/orbsvcs/Shutdown_Utilities.h: + * orbsvcs/orbsvcs/Time_Utilities.cpp: + * orbsvcs/orbsvcs/Time_Utilities.h: + * orbsvcs/orbsvcs/Time_Utilities.i: + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * orbsvcs/orbsvcs/AV/AVStreams_i.h: + * orbsvcs/orbsvcs/AV/AVStreams_i.i: + * orbsvcs/orbsvcs/AV/AV_Core.cpp: + * orbsvcs/orbsvcs/AV/AV_Core.h: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy.h: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h: + * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp: + * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i: + * orbsvcs/orbsvcs/AV/Flows_T.cpp: + * orbsvcs/orbsvcs/AV/Flows_T.h: + * orbsvcs/orbsvcs/AV/MCast.cpp: + * orbsvcs/orbsvcs/AV/MCast.h: + * orbsvcs/orbsvcs/AV/MCast.i: + * orbsvcs/orbsvcs/AV/Policy.cpp: + * orbsvcs/orbsvcs/AV/Policy.h: + * orbsvcs/orbsvcs/AV/Policy.i: + * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp: + * orbsvcs/orbsvcs/AV/Protocol_Factory.h: + * orbsvcs/orbsvcs/AV/QoS_UDP.cpp: + * orbsvcs/orbsvcs/AV/QoS_UDP.h: + * orbsvcs/orbsvcs/AV/QoS_UDP.i: + * orbsvcs/orbsvcs/AV/RTCP.cpp: + * orbsvcs/orbsvcs/AV/RTCP.h: + * orbsvcs/orbsvcs/AV/RTCP_Channel.cpp: + * orbsvcs/orbsvcs/AV/RTCP_Channel.h: + * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp: + * orbsvcs/orbsvcs/AV/RTCP_Packet.h: + * orbsvcs/orbsvcs/AV/RTP.cpp: + * orbsvcs/orbsvcs/AV/RTP.h: + * orbsvcs/orbsvcs/AV/Resource_Factory.h: + * orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp: + * orbsvcs/orbsvcs/AV/SCTP_SEQ.h: + * orbsvcs/orbsvcs/AV/TCP.cpp: + * orbsvcs/orbsvcs/AV/TCP.h: + * orbsvcs/orbsvcs/AV/Transport.cpp: + * orbsvcs/orbsvcs/AV/Transport.h: + * orbsvcs/orbsvcs/AV/Transport.i: + * orbsvcs/orbsvcs/AV/UDP.cpp: + * orbsvcs/orbsvcs/AV/UDP.h: + * orbsvcs/orbsvcs/AV/UDP.i: + * orbsvcs/orbsvcs/AV/default_resource.cpp: + * orbsvcs/orbsvcs/AV/default_resource.h: + * orbsvcs/orbsvcs/AV/media_timer.cpp: + * orbsvcs/orbsvcs/AV/media_timer.h: + * orbsvcs/orbsvcs/AV/ntp-time.h: + * orbsvcs/orbsvcs/AV/sfp.cpp: + * orbsvcs/orbsvcs/AV/sfp.h: + * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_Lock.h: + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h: + * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h: + * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp: + * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h: + * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp: + * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i: + * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h: + * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i: + * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h: + * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i: + * orbsvcs/orbsvcs/ESF/ESF_Defaults.h: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i: + * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h: + * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i: + * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h: + * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h: + * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i: + * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h: + * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i: + * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h: + * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i: + * orbsvcs/orbsvcs/ESF/ESF_Worker.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Worker.h: + * orbsvcs/orbsvcs/ETCL/ETCL.ll: + * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp: + * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i: + * orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h: + * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp: + * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h: + * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp: + * orbsvcs/orbsvcs/Event/ECG_Adapters.cpp: + * orbsvcs/orbsvcs/Event/ECG_Adapters.h: + * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp: + * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i: + * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp: + * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h: + * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i: + * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp: + * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h: + * orbsvcs/orbsvcs/Event/ECG_Defaults.h: + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h: + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i: + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp: + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h: + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i: + * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp: + * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h: + * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp: + * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h: + * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp: + * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h: + * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i: + * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_EH.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_EH.i: + * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i: + * orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl: + * orbsvcs/orbsvcs/Event/EC_And_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_And_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i: + * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp: + * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h: + * orbsvcs/orbsvcs/Event/EC_Busy_Lock.i: + * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp: + * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h: + * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h: + * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp: + * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_Factory.i: + * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h: + * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h: + * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h: + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i: + * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp: + * orbsvcs/orbsvcs/Event/EC_Event_Channel.h: + * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp: + * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h: + * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i: + * orbsvcs/orbsvcs/Event/EC_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Filter.i: + * orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Filter_Builder.i: + * orbsvcs/orbsvcs/Event/EC_Gateway.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway.h: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i: + * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i: + * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Negation_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Null_Factory.h: + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h: + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i: + * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i: + * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp: + * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h: + * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i: + * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp: + * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h: + * orbsvcs/orbsvcs/Event/EC_QOS_Info.h: + * orbsvcs/orbsvcs/Event/EC_QOS_Info.i: + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h: + * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i: + * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h: + * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i: + * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h: + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.i: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i: + * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp: + * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h: + * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp: + * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h: + * orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp: + * orbsvcs/orbsvcs/Event/EC_SupplierControl.h: + * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i: + * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h: + * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i: + * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Type_Filter.h: + * orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp: + * orbsvcs/orbsvcs/Event/EC_UDP_Admin.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl: + * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h: + + Added versioned namespace support. + Wed Nov 9 22:54:43 USMST 2005 Yan Dai <dai_y@ociweb.com> * TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl: @@ -189,7 +636,7 @@ Mon Nov 7 12:07:44 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/PortableServer/POA_Current.h (POA_Current): - Re-exported this class. Unfortunately, some TAO other libraries + Re-exported this class. Unfortunately, some other TAO libraries make direct calls on this class. Addresses unresolved symbol errors. diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index da3613c061c..5af70a4c2aa 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -32,6 +32,8 @@ ACE_RCSID (AV, AVStreams_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_Qos //------------------------------------------------------------ @@ -5296,3 +5298,5 @@ TAO_Tokenizer::operator [] (size_t index) const return this->token_array_[index]; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index c40d26c3e1e..29699f8e8d5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -15,6 +15,18 @@ #define AVSTREAMS_I_H #include /**/ "ace/pre.h" +#include "AV_Core.h" + +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/CosPropertyS.h" +#include "orbsvcs/AVStreamsS.h" +#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/AV/AV_Core.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/Null_MediaCtrlS.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" + #include "ace/OS.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/ATM_Addr.h" @@ -28,19 +40,11 @@ #include "ace/Svc_Handler.h" #include "ace/SOCK_Acceptor.h" -#include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/CosPropertyS.h" -#include "orbsvcs/AVStreamsS.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/AV/AV_Core.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/Null_MediaCtrlS.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" - #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Hash_Map_Manager <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map; typedef ACE_Hash_Map_Entry <ACE_CString,AVStreams::FlowEndPoint_var> FlowEndPoint_Map_Entry; typedef ACE_Hash_Map_Iterator <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map_Iterator; @@ -50,7 +54,6 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> Flow_Handler_Map_Iterator; -#include "AV_Core.h" class TAO_AV_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl @@ -1518,6 +1521,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include "Transport.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i index e192b5f05a0..81731c09f05 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i @@ -1,7 +1,8 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// AVStreams_i.i +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_AV_QoS & @@ -58,4 +59,4 @@ TAO_AV_QoS::get_flow_qos (const char *flowname, return 0; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index de9876a3e7b..1525b981483 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -24,6 +24,8 @@ #include "ace/Dynamic_Service.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_Core //------------------------------------------------------------ @@ -1167,7 +1169,6 @@ TAO_AV_Core::get_flowname (const char *flow_spec_entry_str) return CORBA::string_dup (flow_name.c_str ()); } - ACE_CString TAO_AV_Core::get_control_flowname(const char *flowname) { @@ -1181,3 +1182,5 @@ TAO_AV_Core::get_control_flowname(const char *flowname) #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> *ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 75cb061cf05..61fa18469a4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -23,6 +23,10 @@ #include "ace/Unbounded_Set.h" #include "ace/Null_Mutex.h" +class ACE_Reactor; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Base_StreamEndPoint; class TAO_AV_Connector_Registry; class TAO_AV_Acceptor_Registry; @@ -33,7 +37,6 @@ class TAO_AV_Transport_Item; class TAO_AV_Transport_Factory; class TAO_AV_Flow_Protocol_Item; class TAO_AV_Flow_Protocol_Factory; -class ACE_Reactor; typedef ACE_Unbounded_Set <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSet; typedef ACE_Unbounded_Set_Iterator <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSetItor; @@ -170,5 +173,7 @@ TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_AV_CORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 8bdc07e2f9a..e2eaa8cbb1d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -23,6 +23,8 @@ ACE_RCSID(AV, Endpoint_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ---------------------------------------------------------------------- // TAO_AV_Endpoint_Strategy // ---------------------------------------------------------------------- @@ -429,3 +431,5 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL ACE_CHECK_RETURN (-1); return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 61a55dd05d5..0fbc4528955 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -17,6 +16,7 @@ #include /**/ "ace/pre.h" #include "AVStreams_i.h" +#include "ace/os_include/os_netdb.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -25,6 +25,10 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ +class ACE_Process_Options; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AV_Endpoint_Strategy * @@ -171,6 +175,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + // Include the templates here. #include "Endpoint_Strategy_T.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index afc93eb5ddc..528222b65cf 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_AV_ENDPOINT_STRATEGY_T_C -#define TAO_AV_ENDPOINT_STRATEGY_T_C +#ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP +#define TAO_AV_ENDPOINT_STRATEGY_T_CPP #include "Endpoint_Strategy_T.h" @@ -9,11 +9,13 @@ #include "ace/Process_Semaphore.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ---------------------------------------------------------------------- // TAO_AV_Endpoint_Reactive_Strategy // ---------------------------------------------------------------------- - template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (void) : stream_endpoint_a_servant_(0), stream_endpoint_b_servant_(0), vdev_servant_(0), @@ -829,4 +831,6 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Pro { } -#endif /* TAO_AV_ENDPOINT_STRATEGY_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_AV_ENDPOINT_STRATEGY_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index 7f4c6de12f4..e6b5dcebcd0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -12,14 +11,14 @@ */ //============================================================================= - - #ifndef TAO_AV_ENDPOINT_STRATEGY_T_H #define TAO_AV_ENDPOINT_STRATEGY_T_H #include /**/ "ace/pre.h" #include "Endpoint_Strategy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AV_Endpoint_Reactive_Strategy * @brief Reactive strategy base class @@ -280,6 +279,8 @@ public: virtual ~TAO_AV_Child_Process_B (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Endpoint_Strategy_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index 6aa86653c46..f7d714c3b52 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -1,4 +1,3 @@ -// Fill_ACE_QoS.cpp // $Id$ #include "Fill_ACE_QoS.h" @@ -7,6 +6,8 @@ ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const iovec Fill_ACE_QoS::iov_ = {0,0}; Fill_ACE_QoS::Fill_ACE_QoS (void) @@ -69,4 +70,6 @@ Fill_ACE_QoS::map (void) return this->flow_spec_map_; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h index edec3a1b093..ede10e0e1ec 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -18,12 +18,16 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) +#include "tao/Versioned_Namespace.h" + #include "ace/SString.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Synch.h" #include "ace/ACE.h" #include "ace/OS_QoS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class Fill_ACE_QoS * @@ -76,5 +80,7 @@ private: FLOW_SPEC_HASH_MAP flow_spec_map_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ #endif /* FILL_ACE_QOS_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 09d59636c1b..4cda527280e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -15,6 +15,8 @@ #include "FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // constructor. TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void) :address_ (0), @@ -1012,3 +1014,5 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Reverse entry_to_string: entry = %s\n",this->entry_.c_str() )); return this->entry_.c_str(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index f55250dbbb3..9dc7bc5b7ed 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- // ============================================================================ /** @@ -22,6 +21,9 @@ #include "ace/Containers.h" #include "ace/SString.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Tokenizer * @brief @@ -346,6 +348,8 @@ public: virtual int parse (const char* flowSpec_entry); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include "Transport.h" #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i index 7d02df695ea..3af4438dd98 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i @@ -1,11 +1,11 @@ // -*- C++ -*- - +// // $Id$ -// FlowSpec_Entry.i - #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int TAO_FlowSpec_Entry::set_direction (const char *direction) @@ -343,3 +343,5 @@ TAO_FlowSpec_Entry::role (TAO_FlowSpec_Entry::Role role) { this->role_ = role; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index 86cef7e0568..bfc0e147f35 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -1,11 +1,12 @@ //$Id$ -#ifndef TAO_AV_FLOWS_T_C -#define TAO_AV_FLOWS_T_C +#ifndef TAO_AV_FLOWS_T_CPP +#define TAO_AV_FLOWS_T_CPP #include "Flows_T.h" #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ------------------------------------------------------------ // TAO_FDev @@ -246,4 +247,6 @@ TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_StreamEndPoint::destroy failed\n")); } -#endif /* TAO_AV_FLOWS_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_AV_FLOWS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index 087fce312fb..f1381e07a50 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -18,6 +17,8 @@ #include "AVStreams_i.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_FDev * @brief Implementation of the AV/Streams Flow Device. @@ -115,6 +116,7 @@ protected: CORBA::String_var flowname_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Flows_T.cpp" diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 02d46a85566..2de91dd1be5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -8,6 +8,8 @@ #include "MCast.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ //TAO_AV_UDP_MCast_Flow_Handler //------------------------------------------------------------ @@ -207,7 +209,6 @@ TAO_AV_UDP_MCast_Transport::recv (char *buf, timeout); } - ssize_t TAO_AV_UDP_MCast_Transport::recv (iovec *iov, int /*iovcnt*/, @@ -215,3 +216,5 @@ TAO_AV_UDP_MCast_Transport::recv (iovec *iov, { return handler_->get_mcast_socket ()->recv (iov,this->peer_addr_,0,timeout); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 710be13f63c..1cbc12ce33c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,8 @@ #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_AV_UDP_MCast_Flow_Handler; /** @@ -105,6 +107,8 @@ protected: ACE_SOCK_Dgram_Mcast *dgram_mcast_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "MCast.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.i b/TAO/orbsvcs/orbsvcs/AV/MCast.i index e77e9b4cd79..08d994f23ed 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.i +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.i @@ -1,4 +1,9 @@ +// -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_UDP_MCast_Flow_Handler //----------------------------------------------------------- @@ -9,6 +14,4 @@ TAO_AV_UDP_MCast_Flow_Handler::get_mcast_socket (void) const return this->dgram_mcast_; } - - - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index 6701affedc8..04bb9086548 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -8,19 +8,19 @@ #include "Policy.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_AV_Policy::TAO_AV_Policy (CORBA::ULong type) :type_ (type) { } - TAO_AV_SSRC_Policy::TAO_AV_SSRC_Policy (CORBA::ULong ssrc) :TAO_AV_Policy (TAO_AV_SSRC_POLICY), ssrc_ (ssrc) { } - TAO_AV_Payload_Type_Policy::TAO_AV_Payload_Type_Policy (int payload_type) :TAO_AV_Policy (TAO_AV_PAYLOAD_TYPE_POLICY), payload_type_ (payload_type) @@ -146,3 +146,5 @@ TAO_AV_Callback::schedule_timer (void) { return this->handler_->schedule_timer (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 222e50afd51..7eaac2ce351 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -14,6 +13,7 @@ #ifndef TAO_AV_POLICY_H #define TAO_AV_POLICY_H + #include /**/ "ace/pre.h" #include "ace/Addr.h" @@ -23,6 +23,8 @@ #include "ace/Time_Value.h" #include "orbsvcs/AV/AV_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + struct TAO_AV_frame_info { CORBA::Boolean boundary_marker; @@ -159,8 +161,12 @@ protected: TAO_AV_Flow_Handler *handler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "Policy.i" #endif /* __ACE_INLINE__ */ + #include /**/ "ace/post.h" + #endif /* TAO_AV_POLICY_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.i b/TAO/orbsvcs/orbsvcs/AV/Policy.i index 0994186e6ed..3ff570e0e6f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.i +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.i @@ -1,5 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //-------------------------------------------------- // TAO_AV_Policy //-------------------------------------------------- @@ -73,3 +77,5 @@ TAO_AV_SFP_Credit_Policy::value (void) { return this->value_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 1f00f0573e4..26a7fa37ce9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -5,6 +5,9 @@ #include "tao/debug.h" #include "ace/Dynamic_Service.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_AV_Flow_Protocol_Factory TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void) { @@ -124,3 +127,5 @@ TAO_AV_Protocol_Object::handle_control_input (ACE_Message_Block *, ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n")); return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index b5b93170f82..c08edb33d47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,7 @@ #include "ace/Service_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_AV_Protocol_Object @@ -96,5 +97,7 @@ public: int ref_count; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_AV_PROTOCOL_FACTORY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 4ede89d151f..534cc8d1ea3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -21,6 +21,8 @@ static int resv_error = 0; static int resv_confirm = 0; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int FillQoSParams (ACE_QoS_Params &qos_params, iovec* iov, @@ -1511,6 +1513,8 @@ TAO_AV_UDP_QoS_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, return object; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_QoS_Flow_Factory, ACE_TEXT ("UDP_QoS_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 8e99c0ad7da..a8175a4663d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // $Id$ // ============================================================================ @@ -12,7 +12,6 @@ // = AUTHOR // Yamuna Krishnamurthy <yamuna@cs.wustl.edu> // -// // ============================================================================ #ifndef TAO_AV_QOS_UDP_H @@ -24,14 +23,15 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) +#include "orbsvcs/AV/Protocol_Factory.h" + #include "ace/OS.h" #include "ace/Service_Config.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h" -#include "orbsvcs/AV/Protocol_Factory.h" - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory { @@ -287,6 +287,8 @@ public: TAO_AV_UDP_QoS_Flow_Handler *handler); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_QoS_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i index 8a98bafa896..9ae1b828b0f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i @@ -1,10 +1,13 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //---------------------------------------------------------------------- // TAO_AV_UDP_Flow_Handler //---------------------------------------------------------------------- + ACE_INLINE ACE_SOCK_Dgram_Mcast_QoS * TAO_AV_UDP_QoS_Flow_Handler::get_socket (void) @@ -74,3 +77,5 @@ TAO_AV_UDP_QoS_Flow_Handler::av_core (void) { return this->av_core_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 0d7124705fe..cdfb1eb1715 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 1994-1995 Regents of the University of California. * All rights reserved. * @@ -44,6 +44,8 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, const ACE_Addr &peer_address) @@ -811,6 +813,7 @@ TAO_AV_RTCP_Callback::ts_offset (ACE_UINT32 offset) this->timestamp_offset_ = offset; } +TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTCP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_RTCP_Flow_Factory, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 38555b63efd..931de992db6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -1,5 +1,6 @@ -/* -*- C++ -*- */ -/*- +// -*- C++ -*- + +/** * Copyright (c) 1993-1994 The Regents of the University of California. * All rights reserved. * @@ -48,16 +49,18 @@ #define TAO_AV_RTCP_H #include /**/ "ace/pre.h" +#include "RTCP_Channel.h" + // FUZZ: disable check_for_math_include -#include "ace/OS.h" -#include "ace/Hash_Map_Manager.h" + #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/RTP.h" +#include "ace/Hash_Map_Manager_T.h" #include <math.h> #include <stdlib.h> -#include "orbsvcs/AV/RTP.h" -#include "RTCP_Channel.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_AV_RTCP_Callback; @@ -244,7 +247,7 @@ private: ACE_UINT32 ssrc_; }; - +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_AV_RTCP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_RTCP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 45f1012972e..0282f7b9abb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "ace/OS.h" - -#include "tao/debug.h" #include "RTCP_Channel.h" #include "RTP.h" +#include "tao/debug.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc, const ACE_Addr *peer_addr) @@ -361,3 +361,4 @@ RTCP_Channel_Out::active (void) return this->active_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index 7e9d4d44857..88e2b4c2feb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -5,12 +5,13 @@ #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "RTP.h" +#include "RTCP_Packet.h" + #include "ace/Message_Block.h" #include "ace/SString.h" -#include "RTP.h" -#include "RTCP_Packet.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class RTCP_Channel_In @@ -216,5 +217,7 @@ private: unsigned int octets_sent_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* RTCP_CHANNEL_INCLUDE */ diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 04037b0791f..f13410c8394 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -2,6 +2,8 @@ #include "RTCP_Packet.h" #include "RTP.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + RTCP_Packet::RTCP_Packet(void) { this->chd_.ver_ = 2; @@ -1202,3 +1204,5 @@ RTCP_SR_Packet::dump (void) ++count; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h index e2fd18dcc64..696378258af 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef RTCP_PACKET_INCLUDE @@ -5,7 +7,11 @@ #include /**/ "ace/pre.h" -#include "ace/Basic_Types.h" +#include "tao/orbconf.h" +#include "tao/Versioned_Namespace.h" + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @struct RTCP_Common_Header @@ -45,7 +51,7 @@ public: RTCP_Packet(char *buffer); /// Destructor - virtual ~RTCP_Packet() = 0; + virtual ~RTCP_Packet(); /// Returns a pointer to a local buffer containing the packet. void get_packet_data(char **buffer, ACE_UINT16 &length); @@ -393,5 +399,7 @@ private: RR_Block *rr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* RTCP_PACKET_INCLUDE */ diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index b29f5bfb890..e12f49d0811 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -41,6 +41,8 @@ #include "ace/OS_NS_arpa_inet.h" #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // RTP_Packet // Constructor for RTP packets received @@ -771,6 +773,8 @@ TAO_AV_RTP_Flow_Factory::control_flow_factory (void) return "RTCP"; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_RTP_Flow_Factory, ACE_TEXT ("RTP_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index 14e17886ab0..e4ca31ad127 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /*- * Copyright (c) 1993-1994 The Regents of the University of California. @@ -141,6 +141,8 @@ #include "FlowSpec_Entry.h" #include "MCast.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_RTP //------------------------------------------------------------ @@ -412,6 +414,8 @@ public: virtual const char*control_flow_factory (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_RTP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_RTP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index aa50d43203d..a14a9087531 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Resource_Factory.h @@ -20,6 +22,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AV_Resource_Factory * @@ -30,7 +34,6 @@ * * */ - class TAO_AV_Export TAO_AV_Resource_Factory : public ACE_Service_Object { @@ -45,5 +48,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_AV_DEFAULT_RESOURCE_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index 59a3ea87259..f8fc425baa1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -13,6 +13,8 @@ ACE_RCSID (AV, SCTP_SEQ, "SCTP_SEQ.cpp,v 1.3 2003/11/05 21:06:53 yamuna Exp") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_SCTP_SEQ_Transport //------------------------------------------------------------ @@ -907,6 +909,8 @@ TAO_AV_SCTP_SEQ_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, return object; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SCTP_SEQ_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_SCTP_SEQ_Flow_Factory, ACE_TEXT ("SCTP_SEQ_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index 3c6d297dd94..a759762d0f2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -14,7 +14,7 @@ #define TAO_AV_SCTP_SEQ_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if defined (ACE_HAS_SCTP) @@ -29,6 +29,7 @@ extern "C" { #include <netinet/sctp.h> }; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Unbounded_Set <ACE_CString> Interface_Seq; typedef ACE_Unbounded_Set_Iterator <ACE_CString> Interface_Seq_Itor; @@ -291,6 +292,8 @@ public: TAO_AV_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_SCTP_SEQ_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_SCTP_SEQ_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 85aa7eef6e2..d015d42791e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -6,6 +6,8 @@ #include "tao/debug.h" #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_TCP_Transport //------------------------------------------------------------ @@ -694,6 +696,8 @@ TAO_AV_TCP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, return TAO_AV_Flow_Handler::handle_timeout (tv,arg); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_AV_TCP_Flow_Factory, ACE_TEXT ("TCP_Flow_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 51bb5235fd6..9e3c338e392 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AV_TCP_Factory * @brief @@ -268,6 +270,8 @@ public: TAO_AV_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_TCP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_TCP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 4cce7ccdd8c..12272a5bc85 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -22,6 +22,9 @@ #include "Transport.i" #endif /* __ACE_INLINE__ */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_Transport_Item //------------------------------------------------------------ @@ -675,3 +678,5 @@ TAO_AV_Transport_Factory::make_connector (void) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 8de06427317..5c91622d65b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -15,6 +15,12 @@ #define TAO_AV_TRANSPORT_H #include /**/ "ace/pre.h" + +#include "FlowSpec_Entry.h" +#include "AV_Core.h" + +#include "orbsvcs/AV/AV_export.h" + #include "ace/Service_Object.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" @@ -22,9 +28,9 @@ #include "ace/Connector.h" #include "ace/Addr.h" #include "ace/SOCK_Dgram.h" -#include "orbsvcs/AV/AV_export.h" -#include "FlowSpec_Entry.h" -#include "AV_Core.h" + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. class TAO_AV_Core; @@ -329,6 +335,7 @@ public: int ref_count; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "Transport.i" diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.i b/TAO/orbsvcs/orbsvcs/AV/Transport.i index 851a27a8b95..c05c2474e2b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.i +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.i @@ -1,9 +1,8 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// Transport.i - - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL //------------------------------------------------------------ // TAO_AV_Transport_Item @@ -108,3 +107,5 @@ TAO_AV_Connector::flowname (void) { return this->flowname_.c_str (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index c3ec44ba771..0dde7040cf8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -15,6 +15,8 @@ ACE_RCSID (AV, UDP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------ // TAO_AV_UDP_Flow_Handler //------------------------------------------------------------ @@ -1071,6 +1073,8 @@ TAO_AV_UDP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, return object; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_UDP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_Flow_Factory, ACE_TEXT ("UDP_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index 1c228004bcf..350c6b47931 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -13,12 +13,15 @@ #ifndef TAO_AV_UDP_H #define TAO_AV_UDP_H + #include /**/ "ace/pre.h" #include "Protocol_Factory.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AV_UDP_Factory * @brief @@ -275,6 +278,8 @@ public: TAO_AV_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Flow_Factory) @@ -287,4 +292,5 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory) #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" + #endif /* TAO_AV_UDP_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.i b/TAO/orbsvcs/orbsvcs/AV/UDP.i index 4ea0abde89a..72025b94dd5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.i +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.i @@ -1,10 +1,13 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //---------------------------------------------------------------------- // TAO_AV_UDP_Flow_Handler //---------------------------------------------------------------------- + ACE_INLINE const ACE_SOCK_Dgram * TAO_AV_UDP_Flow_Handler::get_socket (void) const @@ -25,3 +28,5 @@ TAO_AV_UDP_Flow_Handler::close (void) { return this->sock_dgram_.close (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index e29c8e154ce..708bfd80308 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -6,6 +6,8 @@ #include "tao/debug.h" #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void) { if (TAO_debug_level > 0) @@ -88,6 +90,8 @@ TAO_AV_Default_Resource_Factory::init (int argc, char *argv[]) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** @@ -101,11 +105,3 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_Default_Resource_Factory, ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_Default_Resource_Factory) // **************************************************************** - - - - - - - - diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 01420bb907f..0bf2a7b930f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file default_resource.h @@ -22,6 +24,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AV_Default_Resource_Factory * @@ -34,7 +38,7 @@ */ class TAO_AV_Export TAO_AV_Default_Resource_Factory -: public TAO_AV_Resource_Factory + : public TAO_AV_Resource_Factory { public: @@ -53,6 +57,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_AV, TAO_AV_Default_Resource_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_Default_Resource_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp index 098515b27d5..b38142c2534 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -42,6 +42,8 @@ static const char rcsid[] = #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdlib.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + MediaTimer* MediaTimer::instance_; MediaTimer::MediaTimer() @@ -89,3 +91,5 @@ ACE_UINT32 MediaTimer::ref_ts() { return (media_ts()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h index 408ecb7136b..e7e060d5cb4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h @@ -1,5 +1,7 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ + /* * Copyright (c) 1995 Regents of the University of California. * All rights reserved. @@ -39,9 +41,13 @@ #define TAO_AV_MEDIA_TIMER_H #include /**/ "ace/pre.h" -#include "ace/Basic_Types.h" +#include "tao/orbconf.h" +#include "tao/Versioned_Namespace.h" + //long random (void); +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class MediaTimer { public: @@ -57,5 +63,7 @@ class MediaTimer ACE_UINT32 offset_; /* random offset */ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_AV_MEDIA_TIMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h index d2e4b5da547..f740a19ab8f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h +++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ /* * Copyright (c) 1995 The Regents of the University of California. @@ -31,14 +32,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#) $Header$ */ + #ifndef TAO_AV_NTP_TIME_H #define TAO_AV_NTP_TIME_H #include /**/ "ace/pre.h" -#include "ace/OS.h" #include "RTCP.h" /* @@ -49,8 +48,8 @@ */ ACE_INLINE u_int usec2ntp(u_int usec) { - u_int t = (usec * 1825) >> 5; - return ((usec << 12) + (usec << 8) - t); + u_int const t = (usec * 1825) >> 5; + return ((usec << 12) + (usec << 8) - t); } /* diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 9c9cccf126a..9eb0e079d42 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1,20 +1,21 @@ // $Id$ #include "sfp.h" -#include "ace/ARGV.h" - #include "tao/debug.h" +#include "ace/ARGV.h" #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // default arguments to pass to use for the ORB -const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBObjRefStyle URL"; +const char TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS[] = "-ORBObjRefStyle URL"; // SFP magic numbers -const char *TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER = "=SFP"; -const char *TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG"; -const char *TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER = "=STA"; -const char *TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER = "=CRE"; -const char *TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER = "=STR"; +const char TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER[] = "=SFP"; +const char TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER[] = "FRAG"; +const char TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER[] = "=STA"; +const char TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER[] = "=CRE"; +const char TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER[] = "=STR"; // SFP version 1.0 const unsigned char TAO_SFP_Base::TAO_SFP_MAJOR_VERSION = 1; @@ -1323,6 +1324,8 @@ TAO_SFP_Frame_State::reset (void) template ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex> *ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_SFP_Factory, ACE_TEXT ("SFP_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 1885a633231..473d7d98580 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -15,22 +15,28 @@ #include /**/ "ace/pre.h" #include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/sfpC.h" -#include "ace/SOCK_Dgram.h" -#include "ace/INET_Addr.h" -#include "tao/CDR.h" #include "Policy.h" #include "MCast.h" #include "AVStreams_i.h" #include "UDP.h" +#include "orbsvcs/sfpC.h" + +#include "tao/CDR.h" + +#include "ace/SOCK_Dgram.h" +#include "ace/INET_Addr.h" + + #define TAO_SFP_MAGIC_NUMBER_LEN 4 #define TAO_SFP_MESSAGE_TYPE_OFFSET 5 #define TAO_SFP_WRITEV_MAX 128 #define TAO_SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_SFP_Fragment_Node * @brief @@ -38,9 +44,7 @@ class TAO_SFP_Fragment_Node { public: - TAO_SFP_Fragment_Node (void) - :data_ (0) - {} + TAO_SFP_Fragment_Node (void) : data_ (0) {} flowProtocol::fragment fragment_info_; ACE_Message_Block *data_; friend bool operator< (const TAO_SFP_Fragment_Node& left, @@ -103,14 +107,14 @@ class TAO_AV_Export TAO_SFP_Base { public: // default arguments to pass to use for the ORB - static const char *TAO_SFP_ORB_ARGUMENTS; + static const char TAO_SFP_ORB_ARGUMENTS[]; // SFP magic numbers - static const char *TAO_SFP_MAGIC_NUMBER; - static const char *TAO_SFP_FRAGMENT_MAGIC_NUMBER; - static const char *TAO_SFP_START_MAGIC_NUMBER; - static const char *TAO_SFP_CREDIT_MAGIC_NUMBER; - static const char *TAO_SFP_STARTREPLY_MAGIC_NUMBER; + static const char TAO_SFP_MAGIC_NUMBER[]; + static const char TAO_SFP_FRAGMENT_MAGIC_NUMBER[]; + static const char TAO_SFP_START_MAGIC_NUMBER[]; + static const char TAO_SFP_CREDIT_MAGIC_NUMBER[]; + static const char TAO_SFP_STARTREPLY_MAGIC_NUMBER[]; // SFP version 1.0 static const unsigned char TAO_SFP_MAJOR_VERSION; @@ -293,6 +297,8 @@ public: TAO_AV_Transport *transport); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_SFP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_SFP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index a8a79821a67..80eeaf1d7ac 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -1,18 +1,16 @@ // $Id$ -#ifndef ACE_CHANNEL_CLIENTS_T_C -#define ACE_CHANNEL_CLIENTS_T_C +#ifndef ACE_CHANNEL_CLIENTS_T_CPP +#define ACE_CHANNEL_CLIENTS_T_CPP #include "orbsvcs/Channel_Clients_T.h" -ACE_RCSID (orbsvcs, - Channel_Clients_T, - "$Id$") - #if !defined (__ACE_INLINE__) #include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL) @@ -38,4 +36,6 @@ ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ( target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } -#endif /* ACE_CHANNEL_CLIENTS_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* ACE_CHANNEL_CLIENTS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index de0933ec05c..10071d978ea 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -27,6 +28,8 @@ #include "orbsvcs/RtecEventCommS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_PushConsumer_Adapter * @@ -78,6 +81,8 @@ private: TARGET *target_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i index 620b6fd04a8..3c21f6c9bb2 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i @@ -1,6 +1,8 @@ +// -*- C++ -*- // // $Id$ -// + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class TARGET> ACE_INLINE ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *t) @@ -14,4 +16,4 @@ ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *t) { } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 5ab30c57eb0..033680044f5 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -24,6 +24,8 @@ ACE_RCSID (Concurrency, CC_Lock, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CC_Lock::CC_Lock (void) : mode_ (CosConcurrencyControl::intention_read), lock_held_ (0) @@ -229,7 +231,7 @@ void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean CC_LockModeIterator::IsDone (void) { - if (current_==CosConcurrencyControl::write) + if (current_ == CosConcurrencyControl::write) return 1; else return 0; @@ -240,3 +242,5 @@ CC_LockModeIterator::GetLockMode (void) { return current_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 668ee73708b..ac9e999568d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -33,6 +33,8 @@ /// modes are not stated as part of the IDL. #define NUMBER_OF_LOCK_MODES 5 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class CC_Lock * @@ -140,5 +142,7 @@ private: CosConcurrencyControl::lock_mode current_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* !defined (_CC_LOCK_H) */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index bfbfb34f812..79f15d1a14d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -19,6 +19,9 @@ ACE_RCSID (Concurrency, CC_LockSet, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Default constructor. CC_LockSet::CC_LockSet (void) @@ -314,9 +317,14 @@ CC_LockSet::dump (void) lock_[CC_W])); } -CORBA::Boolean CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] ={ - {1, 1, 1, 1, 0}, - {1, 1, 1, 0, 0}, - {1, 1, 0, 0, 0}, - {1, 0, 0, 1, 0}, - {0, 0, 0, 0, 0}}; +CORBA::Boolean const +CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] = + { + {1, 1, 1, 1, 0}, + {1, 1, 1, 0, 0}, + {1, 1, 0, 0, 0}, + {1, 0, 0, 1, 0}, + {0, 0, 0, 0, 0} + }; + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 75bb4e1a88f..f34c8c84e9d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -56,6 +56,8 @@ /// modes are not stated as part of the IDL. #define NUMBER_OF_LOCK_MODES 5 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Enummeration representing the lock modes. The incoming request is /// always converted to this representation. There are two reasons for /// this: Firstly the lock modes are ordered from weakest to strongest @@ -181,7 +183,7 @@ private: /// Mapping between requested and held lock modes. Used by compatible /// (...). Uses the internal enumeration as indices. - static CORBA::Boolean compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]; + static CORBA::Boolean const compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]; /// Lock to ensure that race conditions does not occur. TAO_SYNCH_MUTEX mlock_; @@ -190,6 +192,8 @@ private: ACE_Unbounded_Queue <CC_LockModeEnum> lock_queue_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* _CC_LOCKSET_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 48a66786043..27010f583fa 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file CC_LockSetFactory.cpp @@ -15,6 +14,8 @@ ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Default constructor CC_LockSetFactory::CC_LockSetFactory (void) { @@ -57,3 +58,5 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index b49944528d8..db840acdd79 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class CC_LockSetFactory * @@ -59,6 +61,8 @@ private: TAO_SYNCH_MUTEX lock_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* _CC_LOCKSETFACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index e52eab77715..9f1085bc7a2 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -18,14 +18,14 @@ ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Concurrency_Loader::TAO_Concurrency_Loader (void) { - // Constructor } TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void) { - // Destructor } int @@ -83,4 +83,6 @@ TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb, return this->concurrency_server_.init (orb, poa.in ()); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_Concurrency, TAO_Concurrency_Loader) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index d9799c51316..6409f2715f7 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ // =========================================================================== @@ -25,6 +27,8 @@ #include "orbsvcs/Concurrency/Concurrency_Utils.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader { public: @@ -63,6 +67,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_Concurrency, TAO_Concurrency_Loader) #endif /* TAO_CONCURRENCY_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 5aaa4d8d70b..8f15dfcebc8 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Concurrency_Utils.cpp @@ -19,6 +18,8 @@ ACE_RCSID (Concurrency, Concurrency_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Default constructor TAO_Concurrency_Server::TAO_Concurrency_Server (void) { @@ -121,3 +122,5 @@ TAO_Concurrency_Server::GetLockSetFactory(void) TAO_Concurrency_Server::~TAO_Concurrency_Server (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index ac92e019ecb..64a199e2dc0 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,9 @@ #include "CC_LockSetFactory.h" #include "concurrency_export.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Concurrency_Server * @@ -68,5 +71,7 @@ private: PortableServer::POA_var poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* _CONCURRENCY_SERVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 01b587f9343..04eb746be4f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -16,6 +16,8 @@ ACE_RCSID (CosEvent, CEC_ConsumerAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), push_admin_ (ec), @@ -135,3 +137,5 @@ TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier { supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 980431bedbb..22fb74b6cc8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** * @file CEC_ConsumerAdmin.h @@ -27,6 +27,8 @@ #include "CEC_ProxyPullSupplier.h" #include "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; /** @@ -144,6 +146,8 @@ private: CORBA::Any event_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i index 254a5bdd1fa..d7761a1f51d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker @@ -31,3 +35,5 @@ TAO_CEC_Propagate_Event_Pull::TAO_CEC_Propagate_Event_Pull (const CORBA::Any& ev : event_ (event) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index c069c20808b..bdbb81a4d75 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -6,6 +6,9 @@ ACE_RCSID (CosEvent, CEC_ConsumerControl, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) { } @@ -55,3 +58,5 @@ void TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*) { } + +TAO_ENDBEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index d25785b24aa..b0c0f22ceaa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_ConsumerControl.h @@ -23,6 +24,8 @@ #include "tao/PortableServer/PortableServer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; class TAO_CEC_ProxyPullSupplier; @@ -90,5 +93,7 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CEC_CONSUMERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index c5fa4c4dba0..e2e9fe1f09d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -38,6 +38,9 @@ ACE_RCSID (CosEvent, CEC_Default_Factory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) { if (orbid_dupped_ != 0) @@ -1316,6 +1319,8 @@ TAO_CEC_Default_Factory::destroy_supplier_control (TAO_CEC_SupplierControl* x) delete x; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 80572e0054f..d964d69584b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Default_Factory.h @@ -26,6 +27,8 @@ #include "ace/Service_Config.h" #include "ace/Time_Value.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CEC_Default_Factory * @@ -204,6 +207,8 @@ private: unsigned int proxy_disconnect_retries_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i index b039316d2cb..0dd3d37f8cb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) : dispatching_ (TAO_CEC_DEFAULT_DISPATCHING), @@ -24,3 +28,5 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) proxy_disconnect_retries_ (TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h index 5a97e4bd902..f7fabae1b16 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Defaults.h @@ -8,7 +9,6 @@ * In this file we set the compile time defaults for the event * channel. * - * * @author Carlos O'Ryan (coryan@cs.wustl.edu) */ //============================================================================= diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index ef98d25450d..6ede95fde93 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -5,6 +5,8 @@ ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) { } @@ -58,3 +60,5 @@ TAO_CEC_Reactive_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy, proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index e6aff0650d3..f07f303f1a7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -1,5 +1,5 @@ -// $Id$ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Dispatching.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_ProxyPushSupplier; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) class TAO_CEC_TypedEvent; @@ -110,6 +112,8 @@ public: #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CEC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 49849ae3f89..98b0ae8b046 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -16,6 +16,8 @@ ACE_RCSID (CosEvent, CEC_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_CEC_Dispatching_Task::svc (void) { @@ -150,3 +152,5 @@ TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL) return 0; } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i index 0bf5b92e030..1432528492a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_Dispatching_Task:: TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager) @@ -77,3 +81,5 @@ TAO_CEC_Invoke_Command::TAO_CEC_Invoke_Command (TAO_CEC_ProxyPushSupplier* proxy this->proxy_->_incr_refcnt (); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index ee2fc24cb05..a554f477090 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -12,6 +12,8 @@ #include "CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Destructor TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) { @@ -173,3 +175,5 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request request->set_result (result_any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index aa3d1bb7800..7045d2bea76 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_DynamicImplementation.h @@ -19,6 +20,9 @@ #include "tao/DynamicInterface/Dynamic_Implementation.h" #include "tao/ORB.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation { // = TITLE @@ -71,6 +75,8 @@ private: CORBA::RepositoryId repository_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i index 5058927e3c9..2f1bff715f7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i @@ -1,7 +1,11 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE -TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer +TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa, TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer, TAO_CEC_TypedEventChannel *typed_event_channel) @@ -12,3 +16,4 @@ TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 65bbebb51cf..3da9d1b480b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -15,6 +15,8 @@ ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_EventChannel:: TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr, TAO_CEC_Factory* factory, @@ -229,3 +231,5 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 62f4884fe88..f9e5cbf7ddf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_EventChannel.h @@ -32,6 +33,8 @@ #include "event_serv_export.h" #include "ace/Hash_Map_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CEC_EventChannel_Attributes * @@ -298,6 +301,8 @@ private: ServantRetryMap retry_map_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i index 256d518b72a..23f8e906f7c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_EventChannel_Attributes:: TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa, @@ -197,3 +201,5 @@ TAO_CEC_EventChannel::get_servant_retry_map (void) { return this->retry_map_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index d0c50f2f037..4cdd59f3266 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -32,6 +32,8 @@ ACE_RCSID (CosEvent, CEC_Event_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) { // Constructor @@ -510,4 +512,6 @@ TAO_CEC_Event_Loader::fini (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 82dcc79f53b..ea8fb5ffad3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -29,6 +29,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CEC_Event_Loader * @@ -101,6 +103,8 @@ private: TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader) #endif /* TAO_CEC_EVENT_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index 4a746e0b71c..c8d507dda6c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -5,6 +5,10 @@ ACE_RCSID(CosEvent, CEC_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_Factory::~TAO_CEC_Factory (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index 5c1272ab1a5..3986c6d6366 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Factory.h @@ -25,6 +26,8 @@ class ACE_Lock; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; @@ -214,5 +217,7 @@ public: destroy_supplier_control (TAO_CEC_SupplierControl*) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CEC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index ddeddeb2ece..5afd264b557 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -4,6 +4,11 @@ ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + + + + TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, @@ -99,3 +104,5 @@ TAO_CEC_MT_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy, this->task_.invoke (proxy, typed_event ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index c19647c53d1..a4ffda1504d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_MT_Dispatching.h @@ -23,6 +24,8 @@ #include "CEC_Dispatching_Task.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; /** @@ -90,6 +93,8 @@ private: int active_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CEC_MT_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index fd172f89e1d..3194d66a76e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -16,6 +16,8 @@ ACE_RCSID (CosEvent, CEC_ProxyPullConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPullConsumer:: @@ -389,3 +391,5 @@ TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 35fae60d38e..423911f6549 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_ProxyPullConsumer.h @@ -9,7 +10,6 @@ */ //============================================================================= - #ifndef TAO_CEC_PROXYPULLCONSUMER_H #define TAO_CEC_PROXYPULLCONSUMER_H @@ -24,6 +24,8 @@ #include "orbsvcs/ESF/ESF_Worker.h" #include "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; class TAO_CEC_ProxyPullSupplier; @@ -133,6 +135,8 @@ private: PortableServer::POA_var default_POA_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i index 86003baa1c4..3c22bfb9af4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullConsumer::is_connected_i (void) const { @@ -34,3 +38,5 @@ TAO_CEC_ProxyPullConsumer::supplier (CosEventComm::PullSupplier_ptr supplier) this->supplier_i (supplier); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 7bbc442b000..31d3eff1894 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -14,6 +14,8 @@ ACE_RCSID (CosEvent, CEC_ProxyPullSupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec) @@ -355,3 +357,5 @@ TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 1f7a0a603d4..3a4a5f469d2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -28,6 +28,8 @@ #include "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_ProxyPullConsumer; @@ -157,6 +159,8 @@ private: ACE_Unbounded_Queue<CORBA::Any> queue_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i index e4c07d62a81..8519794c295 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullSupplier::is_connected_i (void) const { @@ -35,3 +39,5 @@ TAO_CEC_ProxyPullSupplier::consumer (CosEventComm::PullConsumer_ptr consumer) this->consumer_i (consumer); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index e6b54a8e24a..65dd613c1c8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -15,6 +15,8 @@ ACE_RCSID (CosEvent, CEC_ProxyPushConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPushConsumer:: @@ -363,3 +365,4 @@ TAO_CEC_ProxyPushConsumer_Guard:: this->event_channel_->destroy_proxy (this->proxy_); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index d16697cb4bd..51f641a464e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_ProxyPushConsumer.h @@ -24,6 +25,8 @@ #include "orbsvcs/ESF/ESF_Worker.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; class TAO_CEC_ProxyPushSupplier; @@ -184,6 +187,8 @@ private: int locked_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i index a9eca16ca37..d30cb94f45c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushConsumer::is_connected_i (void) const { @@ -42,3 +46,5 @@ TAO_CEC_ProxyPushConsumer_Guard::locked (void) const { return this->locked_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 4dac60736bf..ce4dde30d4d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -30,6 +30,8 @@ ACE_RCSID (CosEvent, CEC_ProxyPushSupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; // TAO_CEC_ProxyPushSupplier Constructure (Un-typed EC) @@ -920,3 +922,5 @@ TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 820a1b705ea..b40b889d93d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_ProxyPushSupplier.h @@ -28,6 +29,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) @@ -193,6 +196,8 @@ private: PortableServer::POA_var default_POA_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i index e7453b533dc..918d4116e35 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushSupplier::is_connected_i (void) const { @@ -90,3 +94,5 @@ TAO_CEC_ProxyPushSupplier::is_typed_ec (void) const } } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index 5367a8c4eda..be36052afe1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -4,6 +4,10 @@ ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index c63ef0f1cdc..791dda5c1d2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Pulling_Strategy.h @@ -23,6 +24,7 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CEC_Pulling_Strategy @@ -63,5 +65,7 @@ public: #endif /* 0 */ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CEC_PULLING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index fba429bf126..4a6c2601e87 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -34,6 +34,8 @@ ACE_RCSID (CosEvent, CEC_Reactive_ConsumerControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, @@ -487,3 +489,4 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 6599729cb7f..dfe4016fd40 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Reactive_ConsumerControl.h @@ -32,6 +33,7 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_EventChannel; @@ -200,6 +202,8 @@ private: TAO_CEC_ConsumerControl *control_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i index ce73a433eba..cd61d83efce 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_Ping_Push_Consumer:: TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control) @@ -15,3 +19,5 @@ TAO_CEC_Ping_Pull_Consumer:: : control_ (control) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 679e5a2a4bf..0ab2cb20668 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -22,6 +22,9 @@ ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_Reactive_Pulling_Strategy:: TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, const ACE_Time_Value &relative_timeout, @@ -198,3 +201,4 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index e4fe8452768..93ce73d3dae 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_Reactive_Pulling_Strategy.h @@ -28,6 +29,9 @@ #include "ace/Event_Handler.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_ProxyPullConsumer; class TAO_CEC_EventChannel; class TAO_CEC_ConsumerAdmin; @@ -136,6 +140,8 @@ private: TAO_CEC_SupplierControl *supplier_control_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i index 729db4ab9f8..319de5688f5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, TAO_CEC_SupplierControl *control) @@ -7,3 +11,5 @@ TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, supplier_control_ (control) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index edf26c332f6..34610b398b3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -35,6 +35,8 @@ ACE_RCSID (CosEvent, CEC_Reactive_SupplierControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, @@ -528,3 +530,4 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 27d9ae5c2bd..4695dec0465 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -31,6 +31,8 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_Reactive_SupplierControl; @@ -216,6 +218,8 @@ private: TAO_CEC_SupplierControl *control_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i index 2f242bef904..e166f46ecf6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_Ping_Push_Supplier:: TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control) @@ -26,3 +30,5 @@ TAO_CEC_Ping_Pull_Supplier:: : control_ (control) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index e73a071e546..ee9e92cf84a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -14,6 +14,9 @@ ACE_RCSID (CosEvent, CEC_SupplierAdmin, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), push_admin_ (ec), @@ -98,3 +101,5 @@ TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 38f312bdc53..0ad1d64c26b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_SupplierAdmin.h @@ -13,7 +14,6 @@ */ //============================================================================= - #ifndef TAO_CEC_SUPPLIERADMIN_H #define TAO_CEC_SUPPLIERADMIN_H @@ -31,6 +31,8 @@ #include "CEC_ProxyPullConsumer.h" #include "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; /** @@ -114,6 +116,8 @@ private: PortableServer::POA_var default_POA_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i index dc20a41a684..ec420d2c576 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker @@ -15,3 +19,5 @@ TAO_CEC_SupplierAdmin:: { this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index f8f3edccd29..41a721d9fcf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -4,6 +4,8 @@ ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) { } @@ -62,3 +64,4 @@ TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 8282081586d..4de8fc0c3f6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_SupplierControl.h @@ -10,7 +11,6 @@ * More details can be found in: * * http://doc.ece.uci.edu/~coryan/EC/ - * */ //============================================================================= @@ -29,6 +29,8 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; class TAO_CEC_ProxyPullConsumer; @@ -104,5 +106,7 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CEC_SUPPLIERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 223438df8ed..4c20d585864 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -10,6 +10,9 @@ #include "CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Implementation skeleton constructor TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel *ec) : typed_event_channel_ (ec), @@ -128,3 +131,5 @@ TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier { supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 1e08da77de5..52ab83d7977 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -1,9 +1,11 @@ -// $Id$ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_TypedConsumerAdmin.h * + * $Id$ + * * @author Jon Astle (jon@astle45.fsnet.co.uk) * * Based on the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu) @@ -27,6 +29,8 @@ #include "CEC_ProxyPushSupplier.h" #include "CEC_TypedEvent.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_TypedEventChannel; //Class TAO_CEC_TypedConsumerAdmin @@ -115,6 +119,8 @@ private: TAO_CEC_TypedEventChannel* typed_event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i index b534a67483b..37a0dd30d28 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_CEC_TypedConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker @@ -9,9 +13,12 @@ TAO_CEC_TypedConsumerAdmin:: } ACE_INLINE -TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event, - TAO_CEC_TypedEventChannel* typed_event_channel) +TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event ( + const TAO_CEC_TypedEvent& typed_event, + TAO_CEC_TypedEventChannel* typed_event_channel) : typed_event_ (typed_event), typed_event_channel_ (typed_event_channel) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index 8a7157b0e0a..bd9c7b54e10 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -1,9 +1,11 @@ -// $Id$ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_TypedEvent.h * + * $Id$ + * * @author Jon Astle (jon@astle45.fsnet.co.uk) */ //============================================================================= @@ -23,6 +25,9 @@ #include "tao/CORBA_methods.h" // **************************************************************** + +// $Id$ + /** * @class TAO_CEC_TypedEvent * @@ -53,6 +58,8 @@ private: CORBA::String_var operation_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i index 6b7203639b1..4c8f0aab997 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void) { @@ -22,3 +26,5 @@ TAO_CEC_TypedEvent::operator= (const TAO_CEC_TypedEvent& other) return *this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 8f6fa6f6021..75e83026e03 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -16,6 +16,8 @@ #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Implementation skeleton constructor TAO_CEC_TypedEventChannel:: TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr, @@ -567,3 +569,4 @@ TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index e055adfb7eb..e91addfd7c9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -1,11 +1,13 @@ -// $Id$ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_TypedEventChannel.h * * @author Jon Astle (jon@astle45.fsnet.co.uk) * + * $Id$ + * * A new implementation of the COS Typed Event Channel, based on * the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu) * @@ -35,6 +37,8 @@ #include "ace/Null_Mutex.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CEC_TypedEventChannel_Attributes * @@ -374,6 +378,7 @@ private: TAO_CEC_Param * parameters_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "CEC_TypedEventChannel.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i index c4821662fa2..f5325253840 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_CEC_TypedEventChannel_Attributes:: TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr s_poa, @@ -197,3 +201,5 @@ TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void) { delete [] parameters_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 444bc9444b3..3906e82e5f3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -14,6 +14,8 @@ #include "ace/Reverse_Lock_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; // Implementation skeleton constructor @@ -417,3 +419,4 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: this->typed_event_channel_->destroy_proxy (this->proxy_); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index de3210df73b..98a8faa15cb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -1,9 +1,10 @@ -// $Id$ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file CEC_TypedProxyPushConsumer.h * + * $Id$ * * @author Jon Astle (jon@astle45.fsnet.co.uk) * @@ -25,6 +26,8 @@ #include "orbsvcs/ESF/ESF_Worker.h" #include "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; class TAO_CEC_DynamicImplementationServer; @@ -183,6 +186,8 @@ private: int locked_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i index 6a1312c7e3e..86eee941060 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const { @@ -13,3 +17,5 @@ TAO_CEC_TypedProxyPushConsumer_Guard::locked (void) const { return this->locked_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index 00421b15a46..6e635da8311 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "CEC_TypedSupplierAdmin.h" @@ -10,6 +8,8 @@ #include "CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Implementation skeleton constructor TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel *ec) : typed_event_channel_ (ec), @@ -107,3 +107,5 @@ TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index ac42bd0ca8b..235023ce977 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -1,11 +1,10 @@ -// $Id$ +// -*- C++ -*- -/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedSupplierAdmin.h * - * $Id: + * $Id$ * * @author Jon Astle (jon@astle45.fsnet.co.uk) * @@ -29,6 +28,8 @@ #include "CEC_TypedProxyPushConsumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CEC_TypedEventChannel; //Class TAO_CEC_TypedSupplierAdmin @@ -97,6 +98,8 @@ private: typed_push_admin_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i index 2d6dd17e750..4a3111bc176 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_CEC_TypedSupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker @@ -7,3 +11,5 @@ TAO_CEC_TypedSupplierAdmin:: { this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp index a4e11e8837a..e33aaee8cd4 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp @@ -9,7 +9,7 @@ #include "ESF_Busy_Lock.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ESF, ESF_Busy_Lock, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> int TAO_ESF_Busy_Lock_Adapter<T>::remove (void) @@ -59,4 +59,6 @@ int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write (void) return this->adaptee_->busy (); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_BUSY_LOCK_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index bb2ea3d2a4a..7a77ddc1d5a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Adapt classes that implement the "busy lock" protocol, to conform /// to the ACE Lock interface. /** @@ -61,6 +63,8 @@ private: Adaptee* adaptee_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Busy_Lock.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i index 6723e66b926..8c39a00c2e9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i @@ -1,8 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> ACE_INLINE TAO_ESF_Busy_Lock_Adapter<T>::TAO_ESF_Busy_Lock_Adapter (T* adaptee) : adaptee_ (adaptee) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 55055171241..89694084172 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -6,7 +6,7 @@ #include "ESF_Copy_On_Read.h" #include "ESF_Worker.h" -ACE_RCSID(ESF, ESF_Copy_On_Read, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: @@ -115,4 +115,6 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_COPY_ON_READ_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index f0b704632f6..b4d60ef6bb1 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Copy_On_Read.h * @@ -18,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class Target> class TAO_ESF_Worker; // **************************************************************** @@ -58,6 +61,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Copy_On_Read.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index 58c09ac03ed..da35f7947e6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -11,7 +11,7 @@ #include "tao/Environment.h" -ACE_RCSID(ESF, ESF_Copy_On_Write, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class COLLECTION, class ITERATOR> CORBA::ULong TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void) @@ -203,4 +203,6 @@ TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>:: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_COPY_ON_WRITE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index 972c3f33b11..db4313324d7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Copy_On_Write.h * @@ -20,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class COLLECTION, class ITERATOR> class TAO_ESF_Copy_On_Write_Collection { @@ -164,6 +167,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i index e4aff9e9491..d3ad3d108c7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class COLLECTION, class ITERATOR> ACE_INLINE TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>:: TAO_ESF_Copy_On_Write_Collection (void) @@ -34,3 +38,4 @@ TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>:: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h index 9d391cccf2b..7eaa3a6d306 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file ESF_Defaults.h * diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index b51648f5f68..d2b5cb9ac45 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -15,10 +15,7 @@ #include "ace/Functor.h" -ACE_RCSID(ESF, - ESF_Delayed_Changes, - "$Id$") - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -214,4 +211,6 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_DELAYED_CHANGES_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 5428426f924..32bb56701f9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file ESF_Delayed_Changes.h * @@ -24,6 +24,8 @@ class ACE_Command_Base; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class Target,class Object> class TAO_ESF_Connected_Command; template<class Target,class Object> class TAO_ESF_Disconnected_Command; template<class Target,class Object> class TAO_ESF_Reconnected_Command; @@ -141,6 +143,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Delayed_Changes.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i index 7ba390a202f..4a2192e5a18 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: connected_i (PROXY *proxy @@ -30,3 +34,5 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: { this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index 96f57baac44..fb3ae4b1a24 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -9,9 +9,7 @@ #include "ESF_Delayed_Command.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ESF, - ESF_Delayed_Command, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class Target, class Object> int TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) @@ -94,4 +92,6 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_DELAYED_COMMAND_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index ee0ab0f3ada..6cd8ad10bc7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Delayed_Command.h * @@ -18,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_Connected_Command * @@ -167,6 +170,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Delayed_Command.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i index 5465f38c4bd..3ffe5697959 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class Target, class Object> TAO_ESF_Connected_Command<Target,Object>:: TAO_ESF_Connected_Command (Target *target, @@ -39,3 +43,5 @@ TAO_ESF_Shutdown_Command<Target>:: : target_ (target) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index 302ab13da41..74bfc1932f6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -11,7 +11,7 @@ #include "ESF_Worker.h" -ACE_RCSID(ESF, ESF_Immediate_Changes, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -44,4 +44,6 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_IMMEDIATE_CHANGES_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index 8d08c77b968..b9dc570be95 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file ESF_Immediate_Changes.h * @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_Immediate_Changes * @@ -50,6 +52,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Immediate_Changes.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i index d90394ed395..ac26e4d5800 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: connected (PROXY *proxy @@ -40,3 +44,5 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index b2b99d61a83..f62dc4237b1 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -5,7 +5,7 @@ #include "ESF_Peer_Workers.h" -ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: @@ -53,4 +53,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: this->for_each (&worker ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PEER_ADMIN_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 8cb50b3d57c..abd9d043c2f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Peer_Admin.h * @@ -18,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_Peer_Admin * @@ -92,6 +95,8 @@ public: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Peer_Admin.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp index ad0678ae0a7..c9526a90326 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp @@ -9,7 +9,7 @@ #include "ESF_Peer_Workers.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class P, class R> void TAO_ESF_Peer_Connected<P,R>::work (P *proxy @@ -48,4 +48,6 @@ TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy ACE_CHECK; // Shouldn't happen, just following the discipline } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PEER_WORKERS_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index 9998a29d19f..36ba3bba4e0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Peer_Workers.h * @@ -18,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_Peer_Connected * @@ -87,6 +90,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Peer_Workers.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i index 0ff67b7692e..02201bde5d5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class P, class R> TAO_ESF_Peer_Connected<P,R>::TAO_ESF_Peer_Connected (R *peer) : peer_ (peer) @@ -23,3 +27,5 @@ TAO_ESF_Peer_Disconnected<P,R>::TAO_ESF_Peer_Disconnected (R *peer) } // **************************************************************** + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index b74bb231759..a8094e3afa8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -3,15 +3,13 @@ #ifndef TAO_ESF_PROXY_ADMIN_CPP #define TAO_ESF_PROXY_ADMIN_CPP - - #if ! defined (__ACE_INLINE__) #include "ESF_Proxy_Admin.i" #endif /* __ACE_INLINE__ */ #include "ESF_Shutdown_Proxy.h" -ACE_RCSID(ESF, ESF_Proxy_Admin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class EVENT_CHANNEL, class PROXY, class INTERFACE> TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: @@ -107,4 +105,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PROXY_ADMIN_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index babfd4a4fcc..8071bc45b1d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Proxy_Admin.h * @@ -19,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_Proxy_Admin * @@ -147,6 +150,8 @@ private: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Proxy_Admin.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i index f6b4d29bc6f..882e6c9c056 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class EC,class P,class I> ACE_INLINE void TAO_ESF_Proxy_Admin<EC,P,I>:: for_each (TAO_ESF_Worker<P> *worker @@ -25,3 +29,4 @@ TAO_ESF_RefCountedRef<C>::~TAO_ESF_RefCountedRef () } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp index 798a34d0cb9..7555834bd53 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp @@ -6,9 +6,7 @@ #include "ESF_Proxy_Collection.h" #include "ESF_Worker.h" -ACE_RCSID (ESF, - ESF_Proxy_Collection, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -17,4 +15,6 @@ TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PROXY_COLLECTION_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index 7777d37e830..62848896325 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Proxy_Collection.h * @@ -19,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class Target> class TAO_ESF_Worker; /** @@ -157,6 +160,8 @@ public: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Proxy_Collection.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp index 04702e9feed..ecaa112999d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -9,11 +9,10 @@ #include "ESF_Proxy_List.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ESF, ESF_Proxy_List, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> -TAO_ESF_Proxy_List<PROXY>:: - TAO_ESF_Proxy_List (void) +TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void) { } @@ -89,4 +88,6 @@ TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->impl_.reset (); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PROXY_LIST_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index 52f1a14c014..83142361906 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Proxy_List.h * @@ -19,6 +20,8 @@ #include "ace/Unbounded_Set.h" #include "ace/Containers.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// A concrete proxy collection. /** * Based on the ACE_Unbounded_Set<> collection, used a double @@ -68,6 +71,8 @@ private: ACE_Unbounded_Set<PROXY*> impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Proxy_List.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i index 881283569ba..67d752fdc6c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*> TAO_ESF_Proxy_List<PROXY>::begin (void) { @@ -17,3 +21,5 @@ TAO_ESF_Proxy_List<PROXY>::size (void) const { return this->impl_.size (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp index 9e6993882d8..34bdc83b5d2 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -9,11 +9,10 @@ #include "ESF_Proxy_RB_Tree.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ESF, ESF_Proxy_RB_Tree, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> -TAO_ESF_Proxy_RB_Tree<PROXY>:: - TAO_ESF_Proxy_RB_Tree (void) +TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void) { } @@ -87,4 +86,6 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->impl_.clear (); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PROXY_RB_TREE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index 1c824f3ad54..a1b675db8a2 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Proxy_RB_Tree.h * @@ -18,6 +19,8 @@ #include "ace/RB_Tree.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Iterator class for a ACE_ESF_RB_Tree template<class PROXY> class TAO_ESF_Proxy_RB_Tree_Iterator @@ -94,6 +97,8 @@ private: Implementation impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Proxy_RB_Tree.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i index 0ba0e20e129..b67178bf7b5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>:: @@ -64,3 +65,5 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::size (void) const { return this->impl_.current_size (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp index 83a1490530f..4c326c03c5e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp @@ -9,7 +9,7 @@ #include "ESF_Proxy_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ESF, ESF_Proxy_RefCount_Guard, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class EC, class P> TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void) @@ -24,4 +24,6 @@ TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void) } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_PROXY_REFCOUNT_GUARD_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index bf1206ade34..14c85f322e9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Proxy_RefCount_Guard.h * @@ -18,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_Proxy_RefCount_Guard * @@ -59,6 +62,8 @@ protected: PROXY *proxy_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Proxy_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i index 7639a89ee12..d0d4fc80ac1 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class EC, class P> ACE_INLINE TAO_ESF_Proxy_RefCount_Guard<EC,P>:: TAO_ESF_Proxy_RefCount_Guard (CORBA::ULong &refcount, @@ -10,3 +14,5 @@ TAO_ESF_Proxy_RefCount_Guard<EC,P>:: proxy_ (proxy) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 1489d6fcce1..4cb3cb9e9be 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_RefCount_Guard.h * @@ -18,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ESF_RefCount_Guard * @@ -45,6 +50,8 @@ protected: T &refcount_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i index b69511a8382..de454aaefe0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> ACE_INLINE TAO_ESF_RefCount_Guard<T>:: TAO_ESF_RefCount_Guard (T &refcount) @@ -14,3 +18,5 @@ TAO_ESF_RefCount_Guard<T>:: { this->refcount_--; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp index 3775862b315..2998344a44e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -10,7 +10,7 @@ #include "ESF_Shutdown_Proxy.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> void TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy @@ -28,4 +28,6 @@ TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_SHUTDOWN_PROXY_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index feffd2ccb3a..733c8ccadf4 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Shutdown_Proxy.h * @@ -19,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// A worker to invoke the shutdown method of each proxy. template<class PROXY> class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY> @@ -32,6 +35,8 @@ public: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ESF_Shutdown_Proxy.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i index 5266f0aa225..51955993b3d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i @@ -1,6 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class PROXY> ACE_INLINE TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp index 6ffea97b026..9de69d5ff82 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp @@ -5,7 +5,7 @@ #include "ESF_Worker.h" -ACE_RCSID(ESF, ESF_Worker, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class Object> TAO_ESF_Worker<Object>::~TAO_ESF_Worker (void) @@ -17,4 +17,6 @@ void TAO_ESF_Worker<Object>::set_size (size_t) { } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ESF_WORKER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index 0acfb7b660d..5ca75753da6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ESF_Worker.h * @@ -19,6 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class Object; namespace CORBA @@ -49,6 +54,8 @@ public: ACE_ENV_ARG_DECL) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Worker.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll index 06f67230fdc..7745930e2fd 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll @@ -1,7 +1,7 @@ %option noyywrap %{ -// ETCL.ll,v 1.3 2002/01/14 19:52:28 parsons Exp +// ETCL.ll,v 1.4 2005/11/10 06:47:23 ossama Exp // ======================================================================== // // = LIBRARY @@ -16,7 +16,7 @@ // // ======================================================================== -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" #include "ETCL_Constraint.h" #include "ETCL_y.h" diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 86c6fdd4fa2..1c853eb6929 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -20,6 +20,8 @@ ACE_RCSID (ETCL, ETCL_Constraint, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ETCL_Constraint::TAO_ETCL_Constraint (void) { } @@ -951,3 +953,5 @@ TAO_ETCL_Preference::accept (TAO_ETCL_Constraint_Visitor *visitor) TAO_ETCL_Constraint_Visitor::~TAO_ETCL_Constraint_Visitor (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i deleted file mode 100644 index 93f2187496c..00000000000 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i +++ /dev/null @@ -1,373 +0,0 @@ -// $Id$ - -ACE_INLINE -TAO_ETCL_Boolean_Literal::TAO_ETCL_Boolean_Literal (int value) - : value_ (value) -{ -} - -ACE_INLINE int -TAO_ETCL_Boolean_Literal::value (void) const -{ - return this->value_; -} - - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Integer_Literal::TAO_ETCL_Integer_Literal (long value) - : value_ (value) -{ -} - -ACE_INLINE long -TAO_ETCL_Integer_Literal::value (void) const -{ - return this->value_; -} - - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Float_Literal::TAO_ETCL_Float_Literal (double value) - : value_ (value) -{ -} - -ACE_INLINE double -TAO_ETCL_Float_Literal::value (void) const -{ - return this->value_; -} - - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_String_Literal::TAO_ETCL_String_Literal (const char *value) - : string_ (value) -{ -} - -ACE_INLINE const char * -TAO_ETCL_String_Literal::value (void) const -{ - return this->string_.c_str (); -} - - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Identifier::TAO_ETCL_Identifier (const char *value) - : string_ (value) -{ -} - -ACE_INLINE const char * -TAO_ETCL_Identifier::value (void) const -{ - return this->string_.c_str (); -} - - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign, - TAO_ETCL_Constraint *integer) - : sign_ (sign), - string_ (0) -{ - this->integer_ = - dynamic_cast<TAO_ETCL_Integer_Literal*> (integer); -} - -ACE_INLINE -TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string) - : sign_ (0), - integer_ (0) -{ - this->string_ = - dynamic_cast<TAO_ETCL_String_Literal*> (string); -} - -ACE_INLINE int -TAO_ETCL_Union_Value::sign (void) const -{ - return this->sign_; -} - -ACE_INLINE TAO_ETCL_Integer_Literal * -TAO_ETCL_Union_Value::integer (void) const -{ - return this->integer_; -} - -ACE_INLINE TAO_ETCL_String_Literal * -TAO_ETCL_Union_Value::string (void) const -{ - return this->string_; -} - - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value, - TAO_ETCL_Constraint *component) - : component_ (component) -{ - this->union_value_ = - dynamic_cast<TAO_ETCL_Union_Value*> (union_value); -} - -ACE_INLINE TAO_ETCL_Union_Value * -TAO_ETCL_Union_Pos::union_value (void) const -{ - return this->union_value_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Union_Pos::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos (TAO_ETCL_Constraint *integer, - TAO_ETCL_Constraint *component) - : component_ (component) -{ - this->integer_ = - dynamic_cast<TAO_ETCL_Integer_Literal*> (integer); -} - -ACE_INLINE TAO_ETCL_Integer_Literal * -TAO_ETCL_Component_Pos::integer (void) const -{ - return this->integer_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Component_Pos::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc (TAO_ETCL_Constraint *identifier, - TAO_ETCL_Constraint *component) - : component_ (component) -{ - this->identifier_ = - dynamic_cast<TAO_ETCL_Identifier*> (identifier); -} - -ACE_INLINE TAO_ETCL_Identifier * -TAO_ETCL_Component_Assoc::identifier (void) const -{ - return this->identifier_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Component_Assoc::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Component_Array::TAO_ETCL_Component_Array (TAO_ETCL_Constraint *integer, - TAO_ETCL_Constraint *component) - : component_ (component) -{ - this->integer_ = - dynamic_cast<TAO_ETCL_Integer_Literal*> (integer); -} - -ACE_INLINE TAO_ETCL_Integer_Literal * -TAO_ETCL_Component_Array::integer (void) const -{ - return this->integer_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Component_Array::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Special::TAO_ETCL_Special (int type) - : type_ (type) -{ -} - -ACE_INLINE int -TAO_ETCL_Special::type (void) const -{ - return this->type_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier, - TAO_ETCL_Constraint *component) - : component_ (component) -{ - this->identifier_ = - dynamic_cast<TAO_ETCL_Identifier*> (identifier); -} - -ACE_INLINE TAO_ETCL_Identifier * -TAO_ETCL_Component::identifier (void) const -{ - return this->identifier_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Component::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Dot::TAO_ETCL_Dot (TAO_ETCL_Constraint *component) - : component_ (component) -{ -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Dot::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Eval::TAO_ETCL_Eval (TAO_ETCL_Constraint *component) - : component_ (component) -{ -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Eval::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Default::TAO_ETCL_Default (TAO_ETCL_Constraint *component) - : component_ (component) -{ -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Default::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Exist::TAO_ETCL_Exist (TAO_ETCL_Constraint *component) - : component_ (component) -{ -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Exist::component (void) const -{ - return this->component_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Unary_Expr::TAO_ETCL_Unary_Expr (int type, - TAO_ETCL_Constraint *subexpr) - : type_ (type), - subexpr_ (subexpr) -{ -} - -ACE_INLINE int -TAO_ETCL_Unary_Expr::type (void) const -{ - return this->type_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Unary_Expr::subexpr (void) const -{ - return this->subexpr_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Binary_Expr::TAO_ETCL_Binary_Expr (int type, - TAO_ETCL_Constraint *lhs, - TAO_ETCL_Constraint *rhs) - : type_ (type), - lhs_ (lhs), - rhs_ (rhs) -{ -} - -ACE_INLINE int -TAO_ETCL_Binary_Expr::type (void) const -{ - return this->type_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Binary_Expr::rhs (void) const -{ - return this->rhs_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Binary_Expr::lhs (void) const -{ - return this->lhs_; -} - -// **************************************************************** - -ACE_INLINE -TAO_ETCL_Preference::TAO_ETCL_Preference (int type, - TAO_ETCL_Constraint *subexpr) - : type_ (type), - subexpr_ (subexpr) -{ -} - -ACE_INLINE int -TAO_ETCL_Preference::type (void) const -{ - return this->type_; -} - -ACE_INLINE TAO_ETCL_Constraint * -TAO_ETCL_Preference::subexpr (void) const -{ - return this->subexpr_; -} diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h index 3cf751e3229..403de155634 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** * @file ETCL_Constraint_Visitor.h @@ -20,6 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ETCL_Literal_Constraint; class TAO_ETCL_Identifier; class TAO_ETCL_Union_Value; @@ -61,4 +65,6 @@ public: virtual int visit_preference (TAO_ETCL_Preference *) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ETCL_CONSTRAINT_VISITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp index 5446ebe6eca..8a85f2bf3e4 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp @@ -8,6 +8,9 @@ ACE_RCSID(ETCL, ETCL_Interpreter, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_SYNCH_MUTEX TAO_ETCL_Interpreter::parserMutex__; TAO_ETCL_Interpreter::TAO_ETCL_Interpreter (void) @@ -105,3 +108,5 @@ TAO_Lex_String_Input::reset (char* input_string) TAO_Lex_String_Input::end_ = input_string + ACE_OS::strlen (TAO_Lex_String_Input::string_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h index 964e32736e5..9d40f09e474 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #include "tao/orbconf.h" #include "ace/Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ETCL_Constraint; /** @@ -93,6 +95,8 @@ private: static char* end_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + /// The union used by lex and bison to build the Abstract Syntax Tree. typedef union { diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp index e7fab71275c..116d28f0c23 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp @@ -20,7 +20,7 @@ #ifdef __cplusplus -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" /* Use prototypes in function declarations. */ #define YY_USE_PROTOS diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index 412bff4ee3d..2d6d9e4bf31 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp @@ -6,6 +6,7 @@ ACE_RCSID (Event, ECG_Adapters, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) { @@ -14,3 +15,5 @@ TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index 85ef35fe098..03ee9965433 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Adapters.h * @@ -27,6 +28,8 @@ class ACE_SOCK_Dgram; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Handler_Shutdown * @@ -68,6 +71,7 @@ public: typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown, ACE_Null_Mutex> TAO_ECG_Refcounted_Handler; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_ECG_ADAPTERS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp deleted file mode 100644 index 86b0590e956..00000000000 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// $Id$ - -#include "ECG_Address_Server_Base.h" - diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 847b38a7208..62bd0a45004 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file ECG_Address_Server_Base.h * @@ -17,6 +17,8 @@ #include "EC_Lifetime_Utils.h" #include "ace/Auto_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Address_Server_Base * @@ -26,13 +28,15 @@ * Adds init () virtual method so that all AddrServer implementations can be * initialized in the same fasion. */ -class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base : - public virtual POA_RtecUDPAdmin::AddrServer +class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base + : public virtual POA_RtecUDPAdmin::AddrServer { public: virtual int init (const char *arg) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ECG_ADDRESS_SERVER_BASE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 0116054cb7d..e31e39e1f53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -17,6 +17,7 @@ ACE_RCSID (Event, ECG_CDR_Message_Receiver, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void) { @@ -603,3 +604,5 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index e63c40c571f..2cf3bbafb3d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file ECG_CDR_Message_Receiver.h * @@ -26,6 +26,8 @@ #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_CDR_Processor * @@ -305,6 +307,8 @@ private: size_t min_purge_count_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_CDR_Message_Receiver.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i index 95530584ccd..078166a6088 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ECG_CDR_Message_Receiver::Requests::Requests (void) : fragmented_requests_ (0) @@ -44,3 +48,4 @@ TAO_ECG_CDR_Message_Receiver::init (TAO_ECG_Refcounted_Endpoint ignore_from // } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 98a17c5dc68..610da370c37 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_ECG_CDR_Message_Sender::init ( TAO_ECG_Refcounted_Endpoint endpoint_rptr @@ -334,3 +336,5 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg } return fragment_count; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index 9b4d1e55c42..10e3c2569bf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_CDR_Message_Sender.h * @@ -26,6 +27,8 @@ #include "ace/INET_Addr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_CDR_Message_Sender * @@ -176,6 +179,8 @@ private: CORBA::Boolean checksum_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_CDR_Message_Sender.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i index 59eeae30034..aa1242d07fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i @@ -1,7 +1,11 @@ +// -*- C++ -*- +// // $Id$ #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc) : endpoint_rptr_ () @@ -48,3 +52,5 @@ TAO_ECG_CDR_Message_Sender::mtu (CORBA::ULong new_mtu) this->mtu_ = new_mtu; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 446b8a5dc40..813ac5f2a9d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -8,6 +8,8 @@ #include "ECG_Complex_Address_Server.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_Complex_Address_Server::TAO_ECG_Complex_Address_Server ( int is_source_mapping) : is_source_mapping_ (is_source_mapping) @@ -164,3 +166,5 @@ TAO_ECG_Complex_Address_Server::dump_content (void) this->default_addr_.get_port_number ())); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index f74b4a8c969..306e1f74daa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -23,6 +23,8 @@ #include "EC_Lifetime_Utils_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Complex_Address_Server * @@ -105,6 +107,8 @@ private: ACE_INET_Addr default_addr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_Complex_Address_Server.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i index a04e3966aa2..b47e2db3e68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server> TAO_ECG_Complex_Address_Server::create (int is_source_mapping) @@ -10,3 +13,5 @@ TAO_ECG_Complex_Address_Server::create (int is_source_mapping) s); return s; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index c08698cff1e..f8d2b10e007 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void) { } @@ -37,3 +39,4 @@ TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *, { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h index ccb9430a14a..5783d5c1497 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_ConsumerEC_Control.h * @@ -22,6 +23,8 @@ #include /**/ "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Gateway_IIOP; class TAO_EC_ProxyPushSupplier; @@ -73,6 +76,8 @@ public: ACE_ENV_ARG_DECL_NOT_USED); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ECG_ConsumerEC_Control_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h index a3b6d0c7358..77dd5a28dae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Defaults.h * diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 557ef8d5771..ac3e7cb31bd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -15,17 +15,19 @@ ACE_RCSID(Event, ECG_Mcast_EH, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, const ACE_TCHAR *net_if, CORBA::ULong sz) - : net_if_ (net_if?ACE_OS::strdup (net_if):0) - , subscriptions_ () - , receiver_ (recv) - , recvbuf_size_ (sz) - , observer_ () - , auto_observer_disconnect_ () + : net_if_ (net_if ? ACE_OS::strdup (net_if) : 0) + , subscriptions_ () + , receiver_ (recv) + , recvbuf_size_ (sz) + , observer_ () + , auto_observer_disconnect_ () { - ACE_ASSERT (this->receiver_); + ACE_ASSERT (this->receiver_); } TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) @@ -285,3 +287,5 @@ TAO_ECG_Mcast_EH::Observer::shutdown (void) this->eh_ = 0; this->deactivator_.deactivate (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 19bebc66dc6..b25734ed026 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Mcast_EH.h * @@ -33,6 +34,8 @@ #include "EC_Lifetime_Utils.h" #include "EC_Lifetime_Utils_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Mcast_EH * @@ -280,6 +283,8 @@ private: TAO_EC_Auto_Command<Observer_Disconnect_Command> auto_observer_disconnect_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_Mcast_EH.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i index 611a8486570..587c2721944 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i @@ -1,6 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ECG_Mcast_EH:: Observer_Disconnect_Command::Observer_Disconnect_Command (void) @@ -56,3 +59,5 @@ Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL) } //*************************************************************************** + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 82cf5df8e01..b499851083a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -22,6 +22,9 @@ ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_EC_Shutdown_Command<TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> > UDP_Sender_Shutdown; @@ -689,6 +692,8 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb, sender_shutdown.disallow_command (); } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_ECG_Mcast_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h index cdfdf2b060f..1b0917145f0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Mcast_Gateway.h * @@ -28,6 +29,8 @@ class ACE_Event_Handler; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Mcast_Gateway * @@ -272,6 +275,8 @@ private: //@} }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ECG_Mcast_Gateway.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i index f4c39d5f7b2..8e126abb9b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) : service_type_ (TAO_ECG_DEFAULT_SERVICE) @@ -26,3 +30,5 @@ TAO_ECG_Mcast_Gateway::Attributes::Attributes (void) , non_blocking (TAO_ECG_DEFAULT_NON_BLOCKING) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 40d40bcbf51..143f93a636e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -9,6 +9,8 @@ ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_Reactive_ConsumerEC_Control:: TAO_ECG_Reactive_ConsumerEC_Control (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -248,3 +250,4 @@ TAO_ECG_Reactive_ConsumerEC_Control_Adapter::handle_timeout ( return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h index 6c745ac5655..04f1de34b94 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Reactive_ConsumerEC_Control.h * @@ -22,9 +23,10 @@ #include "tao/ORB.h" #include "tao/PolicyC.h" - #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ECG_Reactive_ConsumerEC_Control; class TAO_EC_Gateway_IIOP; @@ -124,6 +126,8 @@ private: #endif /* TAO_HAS_CORBA_MESSAGING */ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ECG_REACTIVE_CONSUMEREC_CONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 7b547c02424..a44a1954a7f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Event, ECG_Reconnect_ConsumerEventChannelControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_Reconnect_ConsumerEC_Control:: TAO_ECG_Reconnect_ConsumerEC_Control (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -313,3 +315,5 @@ TAO_ECG_Reconnect_ConsumerEC_Control_Adapter::handle_timeout ( this->adaptee_->handle_timeout (tv, arg); return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h index 1b9733b2989..ef9bf5e91d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Reconnect_ConsumerEC_Control.h * @@ -24,6 +25,8 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ECG_Reconnect_ConsumerEC_Control; class TAO_EC_Gateway_IIOP; @@ -137,6 +140,8 @@ private: #endif /* TAO_HAS_CORBA_MESSAGING */ }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ECG_RECONNECT_CONSUMEREC_CONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp index 42533aa07b0..cb53560d707 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp @@ -6,6 +6,8 @@ #include "ECG_Simple_Address_Server.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void) { } @@ -21,13 +23,16 @@ TAO_ECG_Simple_Address_Server::init (const char *mcast_addr) } void -TAO_ECG_Simple_Address_Server::get_addr (const RtecEventComm::EventHeader& /*header*/, - RtecUDPAdmin::UDP_Addr_out addr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_ECG_Simple_Address_Server::get_addr ( + const RtecEventComm::EventHeader& /*header*/, + RtecUDPAdmin::UDP_Addr_out addr + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // unsigned long addr.ipaddr = this->addr_.get_ip_address (); // unsigned short addr.port = this->addr_.get_port_number (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index fa9c83fcbf7..955e24ae51c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Simple_Address_Server.h * @@ -16,6 +17,8 @@ #include "EC_Lifetime_Utils_T.h" #include "ace/INET_Addr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Simple_Address_Server * @@ -56,6 +59,8 @@ private: ACE_INET_Addr addr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_Simple_Address_Server.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i index 6ff6f63b977..0aa18cada97 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i @@ -1,6 +1,8 @@ +// -*- C++ -*- +// // $Id$ - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server> TAO_ECG_Simple_Address_Server::create (void) @@ -11,3 +13,5 @@ TAO_ECG_Simple_Address_Server::create (void) s); return s; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index ae4c0aa8e57..1009f8b4e00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -5,6 +5,8 @@ #include "ace/Reactor.h" #include "ace/os_include/os_fcntl.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv) : receiver_ (recv) { @@ -92,3 +94,5 @@ TAO_ECG_Simple_Mcast_EH::handle_input (ACE_HANDLE /* fd */) { return this->receiver_->handle_input (this->dgram_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h index e1b4bdfd13c..e2306a5cdd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_Simple_Mcast_EH.h * @@ -21,6 +22,9 @@ #include "ECG_Adapters.h" #include "ace/SOCK_Dgram_Mcast.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_Simple_Mcast_EH * @@ -86,5 +90,7 @@ private: TAO_ECG_Dgram_Handler* receiver_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ECG_SIMPLE_Mcast_EH_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index d57d733eefc..b7e435f23f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -10,6 +10,8 @@ ACE_RCSID(Event, ECG_UDP_EH, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) : receiver_ (recv) { @@ -82,4 +84,6 @@ TAO_ECG_UDP_EH::handle_input (ACE_HANDLE) return this->receiver_->handle_input (this->dgram_); } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index c5fbe539767..966c27ac2b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_UDP_EH.h * @@ -24,8 +25,9 @@ #include "ECG_Adapters.h" #include "ace/SOCK_Dgram.h" -class TAO_ECG_UDP_Receiver; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_ECG_UDP_Receiver; /** * @class TAO_ECG_UDP_EH @@ -98,6 +100,8 @@ private: TAO_ECG_Dgram_Handler* receiver_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_UDP_EH.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i index 08757211897..d84f70937b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i @@ -1,9 +1,13 @@ +// -*- C++ -*- // // $Id$ -// + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_SOCK_Dgram& TAO_ECG_UDP_EH::dgram (void) { return this->dgram_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 9b3cd513e9d..8f5af1c7ffe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -10,12 +10,13 @@ ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void) { this->dgram_.close (); - delete[] this->ifs_; - this->ifs_ = 0; + delete [] this->ifs_; } CORBA::Boolean @@ -51,7 +52,6 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from) return 0; } - TAO_ECG_UDP_Out_Endpoint& TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs) { @@ -79,3 +79,5 @@ TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs) return *this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h index 1dd40b093d9..83894c55a7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_UDP_Out_Endpoint.h * @@ -28,6 +29,8 @@ class ACE_INET_Addr; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_UDP_Out_Endpoint * @@ -92,6 +95,8 @@ private: */ typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex> TAO_ECG_Refcounted_Endpoint; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_UDP_Out_Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i index 7b625aa93cb..9f8fd0df5f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i @@ -1,6 +1,8 @@ +// -*- C++ -*- // // $Id$ -// + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void) @@ -32,3 +34,4 @@ TAO_ECG_UDP_Out_Endpoint::next_request_id (void) return this->request_id_generator_++; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h index 6cbbad89ff0..f6cb2fb5cec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_UDP_Protocol.h * @@ -18,6 +19,8 @@ #include "ace/config-all.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ECG_UDP_Protocol * @@ -67,5 +70,7 @@ public: }; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ECG_UDP_PROTOCOL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 5a26c45edef..b1b89afea29 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -15,6 +15,8 @@ ACE_RCSID (Event, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void) { this->consumer_proxy_ = @@ -244,3 +246,5 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) ACE_ENDTRY; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index e5de7f78b19..f8a99055484 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_UDP_Receiver.h * @@ -51,9 +52,12 @@ #include "EC_Lifetime_Utils_T.h" #include "ECG_CDR_Message_Receiver.h" -class TAO_ECG_UDP_Out_Endpoint; class ACE_Reactor; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_ECG_UDP_Out_Endpoint; + /** * @class TAO_ECG_UDP_Receiver_Disconnect_Command * @@ -223,6 +227,7 @@ private: ECG_Receiver_Auto_Proxy_Disconnect auto_proxy_disconnect_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) #include "ECG_UDP_Receiver.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i index 39ff8265264..47eb3d83958 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ECG_UDP_Receiver_Disconnect_Command:: TAO_ECG_UDP_Receiver_Disconnect_Command (void) @@ -98,3 +102,5 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, this->addr_server_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index ed7b42c08ce..9186de3d2dc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -23,6 +23,8 @@ ACE_RCSID (Event, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void) { } @@ -230,3 +232,5 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 0f631502117..1899b91099a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ECG_UDP_Sender.h * @@ -52,6 +53,9 @@ #include "ECG_CDR_Message_Sender.h" class ACE_SOCK_Dgram; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ECG_UDP_Out_Endpoint; /** @@ -214,6 +218,8 @@ private: ECG_Sender_Auto_Proxy_Disconnect auto_proxy_disconnect_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl index bc7e81f477a..c58a7a81ca8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl @@ -1,8 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> TAO_ECG_UDP_Sender::create (CORBA::Boolean crc) { @@ -89,3 +92,5 @@ TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL) release_proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index ff3a295b1cc..94317bbe11c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -4,9 +4,10 @@ ACE_RCSID(Event, EC_And_Filter, "$Id$") -TAO_EC_And_Filter:: - TAO_EC_And_Filter (TAO_EC_Filter* children[], - size_t n) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[], + size_t n) : children_ (children), n_ (n) { @@ -165,3 +166,5 @@ TAO_EC_And_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index 0da3c85cfe9..7fa8c6dc5cd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_And_Filter.h * @@ -22,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_And_Filter * @@ -80,5 +83,7 @@ private: size_t n_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_AND_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 78e8387fb41..9cf1a452ceb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -24,6 +24,8 @@ ACE_RCSID (Event, EC_Basic_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void) { } @@ -257,3 +259,4 @@ TAO_EC_Basic_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h index 9a886ff0c04..adc8ed097d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Basic_Factory.h * @@ -23,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Basic_Factory * @@ -110,6 +113,8 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_BASIC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index b1b7b1ca222..c2ccd077a81 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -17,6 +17,9 @@ ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) { } @@ -196,3 +199,5 @@ TAO_EC_Basic_Filter_Builder:: } return count; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 98288fd5a2f..084a80832bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Basic_Filter_Builder.h * @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -67,6 +70,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Basic_Filter_Builder.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i index c4cffeb9f08..ebf53c20045 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Basic_Filter_Builder:: TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel_Base *ec) : event_channel_ (ec) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 30605712f32..a1773b467e7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -4,10 +4,11 @@ ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$") -TAO_EC_Bitmask_Filter:: - TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, - CORBA::ULong type_mask, - TAO_EC_Filter* child) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, + CORBA::ULong type_mask, + TAO_EC_Filter* child) : source_mask_ (source_mask), type_mask_ (type_mask), child_ (child) @@ -117,3 +118,5 @@ TAO_EC_Bitmask_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index 2b537c2cc84..e2f8e11b273 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Bitmask_Filter.h * @@ -23,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Bitmask_Filter * @@ -98,5 +101,7 @@ private: TAO_EC_Filter* child_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_BITMASK_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp index e85b8a15dab..8d35565f73b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp @@ -9,7 +9,7 @@ #include "EC_Busy_Lock.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Busy_Lock, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> int TAO_EC_Busy_Lock_Adapter<T>::remove (void) @@ -59,4 +59,6 @@ int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write (void) return this->adaptee_->busy (); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_EC_BUSY_LOCK_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index 099c708e3c1..6ea0048ae19 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Busy_Lock.h * @@ -22,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class Adaptee> class TAO_EC_Busy_Lock_Adapter { @@ -45,6 +48,8 @@ private: Adaptee* adaptee_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Busy_Lock.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i index dd4c3e7a956..670ad09dd63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i @@ -1,8 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> ACE_INLINE TAO_EC_Busy_Lock_Adapter<T>::TAO_EC_Busy_Lock_Adapter (T* adaptee) : adaptee_ (adaptee) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp index 1f7e055cde8..cf129fc768f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp @@ -8,6 +8,8 @@ #include "EC_Channel_Destroyer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_EC_Channel_Destroyer_Functor::operator() ( TAO_EC_Event_Channel_Base * event_channel) @@ -24,3 +26,5 @@ TAO_EC_Channel_Destroyer_Functor::operator() ( } ACE_ENDTRY; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h index 90ae3a9b1ea..c0800bc37ee 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + /** * @file EC_Channel_Destroyer.h * @@ -12,6 +14,8 @@ #include "EC_Event_Channel_Base.h" #include "ace/Auto_Functor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @struct TAO_EC_Channel_Destroyer_Functor * @@ -37,5 +41,6 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Channel_Destroyer_Functor> TAO_EC_Channel_Destroyer; +TAO_END_VERSIONED_NAMESPACE_DECL #endif // EC_CHANNEL_DESTROYER__H_ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 696320fde99..8511a1580b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT; TAO_EC_Conjunction_Filter:: @@ -203,3 +205,5 @@ TAO_EC_Conjunction_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index a39e79c6c77..261e9c37273 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Conjunction_Filter.h * @@ -23,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Conjunction_Filter * @@ -104,5 +107,7 @@ private: ChildrenIterator current_child_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_CONJUNCTION_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 3ba08f2c8fb..22b7e470556 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Event, EC_ConsumerAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec) { @@ -35,3 +37,5 @@ TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index e6d2ee2f90f..5e9cda19796 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_ConsumerAdmin.h * @@ -27,10 +28,11 @@ #include /**/ "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushConsumer; - /** * @class TAO_EC_ConsumerAdmin * @@ -72,6 +74,8 @@ private: PortableServer::POA_var default_POA_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_CONSUMERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 386970cf1d9..49da2e81864 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -40,6 +40,8 @@ ACE_RCSID(Event, EC_Default_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void) { } @@ -988,6 +990,8 @@ TAO_EC_Default_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i index 3ff451b166a..2564cd3b0c5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Default_Factory::TAO_EC_Default_Factory (void) : dispatching_ (TAO_EC_DEFAULT_DISPATCHING), @@ -51,3 +55,5 @@ TAO_EC_Default_Factory::orb_id (void) const { return this->orbid_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index ab836a8dcbf..4399814bb2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_Default_ProxyPushConsumer:: @@ -186,3 +188,5 @@ TAO_EC_Default_ProxyPushConsumer::object_id (ACE_ENV_SINGLE_ARG_DECL) this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER); return result.in (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 7b0f7648cef..f45c4adedae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Default_ProxyConsumer.h * @@ -23,6 +24,8 @@ #include "EC_ProxyConsumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; class TAO_EC_Supplier_Filter; @@ -75,6 +78,8 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_DEFAULT_PROXYCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index 1265d53d656..e796a3e562f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Event, EC_ProxySupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_Default_ProxyPushSupplier::TAO_EC_Default_ProxyPushSupplier ( @@ -222,3 +224,5 @@ TAO_EC_Default_ProxyPushSupplier::object_id (ACE_ENV_SINGLE_ARG_DECL) return result.in (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index 2284340aad3..df169125676 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Default_ProxySupplier.h * @@ -22,15 +23,17 @@ #include "EC_ProxySupplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Default_ProxyPushSupplier * * @brief Implement the ReliableEventChannelAdmin::ProxyPushSupplier * interface */ -class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier : - public POA_RtecEventChannelAdmin::ProxyPushSupplier, - public TAO_EC_ProxyPushSupplier +class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier + : public POA_RtecEventChannelAdmin::ProxyPushSupplier, + public TAO_EC_ProxyPushSupplier { public: @@ -72,6 +75,8 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_DEFAULT_PROXYSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index ffd6030faa8..a703c917e56 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Disjunction_Filter:: TAO_EC_Disjunction_Filter (TAO_EC_Filter* children[], size_t n) @@ -157,3 +159,5 @@ TAO_EC_Disjunction_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index bdc8c1715ba..473520b88d8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Disjunction_Filter.h * @@ -22,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Disjunction_Filter * @@ -81,5 +84,7 @@ private: size_t n_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_DISJUNCTION_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index a38dcbbdce7..50c71ef885f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -5,7 +5,10 @@ ACE_RCSID(Event, EC_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Dispatching::~TAO_EC_Dispatching (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 8d125229aa1..a71e6f9a4a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Dispatching.h * @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_QOS_Info; class TAO_EC_ProxyPushSupplier; @@ -74,6 +77,8 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 914903de35b..870492fbd01 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -16,6 +16,9 @@ ACE_RCSID (Event, EC_Dispatching, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) : queue_full_action_return_value_ (WAIT_TO_EMPTY) { @@ -207,3 +210,4 @@ TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 7ccce75bc25..3be42dd67dd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -32,6 +32,8 @@ #include "ace/Service_Config.h" #include "ace/Global_Macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward decl class TAO_EC_Dispatching_Task; @@ -183,6 +185,8 @@ private: RtecEventComm::EventSet event_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i index 12694120844..37930e408fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Queue:: TAO_EC_Queue (size_t high_water_mark, @@ -87,3 +91,5 @@ TAO_EC_Push_Command::TAO_EC_Push_Command ( this->proxy_->_incr_refcnt (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index fa498a4d514..c4621550c90 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -6,6 +6,8 @@ ACE_RCSID(Event, EC_Event_Channel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Event_Channel:: TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, TAO_EC_Factory* factory, @@ -31,3 +33,5 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, this->create_strategies (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index 04b1ce0cfb9..8afbe38ef4e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Event_Channel.h * @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Event_Channel * @@ -52,6 +55,8 @@ public: int own_factory = 0); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_EVENT_CHANNEL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index 4a9d5cd7f34..5440996bb38 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -16,6 +16,8 @@ ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Event_Channel_Base:: TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, TAO_EC_Factory* factory, @@ -347,3 +349,5 @@ TAO_EC_Event_Channel_Base::for_each_supplier ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 39b168a4c85..1b9f263fa86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Event_Channel_Base.h * @@ -29,6 +30,8 @@ #include "orbsvcs/RtecEventChannelAdminS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class> class TAO_ESF_Worker; /** @@ -363,6 +366,8 @@ protected: int status_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Event_Channel_Base.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i index f3a4d6a784d..1883f84ef11 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Event_Channel_Attributes:: TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa, @@ -198,3 +202,5 @@ TAO_EC_Event_Channel_Base::destroyed (void) ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return (this->status_ == EC_S_DESTROYED); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index 6ce94287fd6..3dec63b81d3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -5,6 +5,10 @@ ACE_RCSID(Event, EC_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Factory::~TAO_EC_Factory (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h index 71c1a0ebfa3..3269d1f82cd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Factory.h * @@ -23,10 +23,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Service_Object.h" class ACE_Lock; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_Dispatching; @@ -156,6 +160,8 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index 220a8403b96..7d908e9ce85 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -13,6 +13,8 @@ ACE_RCSID (Event, EC_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Filter::~TAO_EC_Filter (void) { } @@ -124,3 +126,5 @@ TAO_EC_Null_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index 63ec4618f78..fbede07f767 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Filter.h * @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_QOS_Info; /** @@ -212,6 +214,8 @@ public: // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Filter.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i index 3820754ed5a..a5b9e121522 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Filter::TAO_EC_Filter (void) : parent_ (0) @@ -37,3 +41,5 @@ TAO_EC_Null_Filter::TAO_EC_Null_Filter (void) } // **************************************************************** + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index 8b8cc5ddbe7..164e044bece 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -9,6 +9,8 @@ ACE_RCSID(Event, EC_Filter_Builder, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void) { } @@ -27,3 +29,5 @@ TAO_EC_Null_Filter_Builder::build ( { return new TAO_EC_Null_Filter; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 92a5a6353a8..9195ccc88e8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Filter_Builder.h * @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Filter; class TAO_EC_ProxyPushSupplier; @@ -77,6 +79,8 @@ public: ACE_ENV_ARG_DECL) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i index 2592a19f93b..89d32fe656e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i @@ -1,6 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 8ef8d8c7ef0..8addbb46165 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -6,6 +6,8 @@ ACE_RCSID (Event, EC_Gateway, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Gateway::TAO_EC_Gateway (void) : handle_ (0) { @@ -27,3 +29,4 @@ TAO_EC_Gateway::observer_handle (void) const return this->handle_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index c5a4253e0ca..7b8e5d99113 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Gateway.h * @@ -22,6 +23,9 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecEventCommS.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Gateway * @@ -60,6 +64,8 @@ private: RtecEventChannelAdmin::Observer_Handle handle_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_EC_GATEWAY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 5ae4f0d558c..d52e1844a9d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -14,6 +14,8 @@ ACE_RCSID (Event, EC_Gateway_IIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) : busy_count_ (0), update_posted_ (0), @@ -709,3 +711,5 @@ TAO_EC_Gateway_IIOP::resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL) supplier_ec_suspended_ = 0; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 178b73e93f7..0a1ede60b4b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -29,6 +29,8 @@ #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ECG_ConsumerEC_Control; class TAO_EC_Gateway_IIOP_Factory; @@ -246,6 +248,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_EC_GATEWAY_IIOP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 6a576bcb0e0..ff9458ef6df 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -22,6 +22,8 @@ ACE_RCSID (Event, EC_Gateway_IIOP_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_EC_Gateway_IIOP_Factory::init_svcs (void) { @@ -199,6 +201,8 @@ TAO_EC_Gateway_IIOP_Factory::destroy_consumerec_control ( delete x; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_EC_Gateway_IIOP_Factory, ACE_TEXT ("EC_Gateway_IIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h index e7d6d05d82d..e85c361d6af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Gateway_IIOP_Factory.h * @@ -24,6 +25,10 @@ #include /**/ "event_serv_export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ECG_ConsumerEC_Control; class TAO_EC_Gateway_IIOP; @@ -96,6 +101,8 @@ protected: int use_consumer_proxy_map_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_EC_Gateway_IIOP_Factory) ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i index 85ac825fd2f..45dbd3f9d3f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int TAO_EC_Gateway_IIOP_Factory::use_ttl (void) const { @@ -12,3 +16,4 @@ TAO_EC_Gateway_IIOP_Factory::use_consumer_proxy_map (void) const return this->use_consumer_proxy_map_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index cb8453bdef8..f86611872fb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -7,6 +7,8 @@ ACE_RCSID (Event, EC_Gateway_sched, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void) : TAO_EC_Gateway_IIOP () { @@ -76,3 +78,5 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 3ab5e935271..6ce4036b6a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Gateway_Sched.h * @@ -24,6 +24,8 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Gateway_Sched * @@ -48,8 +50,10 @@ public: RtecScheduler::Scheduler_ptr consumer_sched, const char* consumer_name, const char* supplier_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_EC_GATEWAY_SCHED_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index aecf424ef41..db153bcf5c0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -22,6 +22,8 @@ ACE_RCSID (Event, EC_Kokyu_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) :allocator_ (0), dispatcher_ (0), @@ -204,3 +206,5 @@ TAO_EC_Kokyu_Push_Command::execute () return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index ec54bc03226..dbd9ecf523b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -32,6 +32,8 @@ #include "Kokyu/Kokyu.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; /** @@ -135,6 +137,8 @@ private: RtecEventComm::EventSet event_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i index b7645af1170..0c116874fad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i @@ -1,12 +1,16 @@ +// -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_INLINE TAO_EC_Kokyu_Shutdown_Command:: -TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator* allocator) +TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator*) : Kokyu::Dispatch_Command () { - ACE_UNUSED_ARG (allocator); } // **************************************************************** @@ -34,3 +38,5 @@ TAO_EC_Kokyu_Push_Command::TAO_EC_Kokyu_Push_Command ( this->proxy_->_incr_refcnt (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 0e5448fdafd..a1ed1476a1b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -19,6 +19,8 @@ ACE_RCSID (Event, EC_Kokyu_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) { } @@ -257,6 +259,8 @@ TAO_EC_Kokyu_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base* ec) return this->TAO_EC_Default_Factory::create_scheduling_strategy (ec); } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Kokyu_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h index 9a1f9ddd4d2..f4d5189edeb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Kokyu_Factory.h * @@ -25,6 +25,8 @@ #include "rtkokyu_event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Kokyu_Factory * @@ -63,6 +65,8 @@ private: int disp_sched_scope_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i index cc78b5b83c8..7119373733f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void) : TAO_EC_Default_Factory (), @@ -7,3 +11,5 @@ TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void) disp_sched_scope_ (ACE_SCOPE_THREAD) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 0f2eee83b7a..27557f5e52c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -35,6 +35,8 @@ const char* designator (long dsgn) return "---"; } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void) { } @@ -507,3 +509,5 @@ TAO_EC_Kokyu_Filter_Builder:: } return i - 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h index b36d1e80350..a7e695ee686 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Kokyu_Filter_Builder.h * @@ -25,6 +25,8 @@ #include "rtkokyu_event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -77,6 +79,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i index db27e8da5db..8e0cd624a7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i @@ -1,8 +1,15 @@ +// -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Kokyu_Filter_Builder:: - TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base *ec) - : event_channel_ (ec) + TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base *ec) + : event_channel_ (ec) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index 48453663f23..9b35aa83642 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void) { } @@ -93,3 +95,5 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event, ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index 52fca631874..7996a8b280f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Kokyu_Scheduling.h * @@ -26,6 +27,8 @@ #include "orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Kokyu_Scheduling * @@ -64,6 +67,8 @@ private: RtecScheduler::Scheduler_var scheduler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Kokyu_Scheduling.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i index b9dbd7d9dfc..1afeb35fa05 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Kokyu_Scheduling::TAO_EC_Kokyu_Scheduling ( RtecScheduler::Scheduler_ptr scheduler) : scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 9c180506dd6..4705b95c008 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Lifetime_Utils.h * @@ -26,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Object_Deactivator * @@ -204,6 +207,7 @@ private: RtecEventChannelAdmin::EventChannel_var ec_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "EC_Lifetime_Utils.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i index 535eda1f85d..2884f04108d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void) : poa_ () @@ -171,3 +175,5 @@ TAO_EC_Event_Channel_Holder::init ( { this->ec_ = ec_var; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp index a66ff2d6412..09b05fecaa4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp @@ -9,6 +9,8 @@ #include "EC_Lifetime_Utils_T.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <typename T> void activate (T & obj_ref, @@ -44,5 +46,6 @@ activate (T & obj_ref, } } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_EC_LIFETIME_UTILS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 0aeff3e86d7..fe7d6a3769e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Lifetime_Utils_T.h * @@ -22,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @brief Helper for activating objects. * Activates @a servant with @a poa and returns the object reference via @@ -183,6 +186,8 @@ bool operator!=(TAO_EC_Servant_Var<X> const & x, TAO_EC_Servant_Var<Y> const & y); +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Lifetime_Utils_T.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i index fb527b3fe5e..bf487ec522a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class T> ACE_INLINE TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void) @@ -328,3 +332,5 @@ operator!=(TAO_EC_Servant_Var<X> const & x, { return x.in() != y.in(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index d243e05c7ab..b6d91f832f0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -4,6 +4,9 @@ ACE_RCSID(Event, EC_MT_Dispatching, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, @@ -86,3 +89,4 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 293fce9464b..c4cf13dc43b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_MT_Dispatching.h * @@ -24,6 +25,8 @@ #include "EC_Dispatching_Task.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_MT_Dispatching * @@ -89,5 +92,7 @@ private: TAO_EC_Queue_Full_Service_Object* queue_full_service_object_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_MT_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 6e6e6a0fde6..7500d99f05e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Masked_Type_Filter:: TAO_EC_Masked_Type_Filter (CORBA::ULong source_mask, CORBA::ULong type_mask, @@ -122,3 +124,5 @@ TAO_EC_Masked_Type_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index a0591c91ef0..5caaeecd010 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Masked_Type_Filter.h * @@ -22,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Masked_Type_Filter * @@ -84,5 +87,7 @@ private: CORBA::ULong type_value_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_MASKED_TYPE_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index de13c0f59a2..72ad44e9fed 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -4,8 +4,9 @@ ACE_RCSID(Event, EC_Negation_Filter, "$Id$") -TAO_EC_Negation_Filter:: - TAO_EC_Negation_Filter (TAO_EC_Filter* child) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) : child_ (child) { this->adopt_child (this->child_); @@ -109,3 +110,5 @@ TAO_EC_Negation_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index ad279949434..f4612a7ef83 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Negation_Filter.h * @@ -23,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Negation_Filter * @@ -77,5 +80,7 @@ private: TAO_EC_Filter* child_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_NEGATION_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 9414cb975d9..3284ec0819d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -21,6 +21,8 @@ ACE_RCSID(Event, EC_Null_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Null_Factory::TAO_EC_Null_Factory (void) { } @@ -236,3 +238,4 @@ TAO_EC_Null_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h index 9a93caef484..2f96a0b0dd0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Null_Factory.h * @@ -22,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Null_Factory * @@ -107,5 +110,7 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_NULL_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 0263f42c989..48f88abd928 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -15,6 +15,8 @@ ACE_RCSID(Event, EC_ObserverStrategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) { } @@ -510,3 +512,5 @@ TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer this->headers_.insert (event.header, 1); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index ca86257c99c..b8d99ea64db 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -35,6 +35,9 @@ #include /**/ "event_serv_export.h" class ACE_Lock; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushConsumer; class TAO_EC_ProxyPushSupplier; @@ -346,6 +349,8 @@ private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_ObserverStrategy.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i index 07fa7ae19d0..231db3f9417 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void) { @@ -73,3 +77,5 @@ TAO_EC_Accumulate_Consumer_Headers:: : headers_ (h) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 1eb2794a909..2d27cfc7f77 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -17,6 +17,8 @@ ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Per_Supplier_Filter:: TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec), @@ -207,3 +209,5 @@ TAO_EC_Per_Supplier_Filter_Builder::destroy ( { delete x; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index ea5f674daf6..5bd8473b13b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Per_Supplier_Filter.h * @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class PROXY> class TAO_ESF_Proxy_Collection; class TAO_EC_Event_Channel_Base; @@ -110,6 +112,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Per_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i index 416f6b68726..4c950811fcc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Per_Supplier_Filter_Builder:: TAO_EC_Per_Supplier_Filter_Builder (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index ed97744f809..35590ac3314 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -17,6 +17,8 @@ ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void) { } @@ -152,3 +154,5 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( pos++; // Consume the event return new TAO_EC_Type_Filter (e.header); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index 5a3cfafd7ad..db0dfef1076 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -22,6 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -59,6 +62,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Prefix_Filter_Builder.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i index c078591f226..c4ddf4074b0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Prefix_Filter_Builder:: TAO_EC_Prefix_Filter_Builder (TAO_EC_Event_Channel_Base *ec) : event_channel_ (ec) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 2942b19527f..89c22f0a791 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec) : ntasks_ (0), tasks_ (0) @@ -135,3 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index 68e7f4b927b..2393868d7a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Priority_Dispatching.h * @@ -27,6 +28,8 @@ #include "ace/Thread_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Dispatching_Task; class TAO_EC_Event_Channel_Base; @@ -81,5 +84,7 @@ private: RtecScheduler::Scheduler_var scheduler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_PRIORITY_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index ce5fd2843e5..826cd5b1732 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void) { } @@ -94,3 +96,5 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 13aca162533..87bac43db35 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Priority_Scheduling.h * @@ -25,6 +26,8 @@ #include "orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Priority_Scheduling * @@ -63,6 +66,8 @@ private: RtecScheduler::Scheduler_var scheduler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Priority_Scheduling.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i index af004f6fcde..2de353d965e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Priority_Scheduling::TAO_EC_Priority_Scheduling ( RtecScheduler::Scheduler_ptr scheduler) : scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index dde5347cec6..422cd66246d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -15,6 +15,8 @@ ACE_RCSID (Event, EC_ProxyConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_ProxyPushConsumer:: @@ -304,3 +306,5 @@ TAO_EC_ProxyPushConsumer_Guard:: this->proxy_->refcount_zero_hook (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index b61ee0885c7..bd233ee352d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_ProxyConsumer.h * @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; class TAO_EC_Supplier_Filter; @@ -225,6 +227,8 @@ private: int locked_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_ProxyConsumer.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i index c6890fff743..44ef91ef2e7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_EC_ProxyPushConsumer::is_connected_i (void) const { @@ -63,3 +67,5 @@ TAO_EC_ProxyPushConsumer_Guard::locked (void) const { return this->locked_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 1fb8ea7bbfe..7e4528a8ea1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -21,6 +21,8 @@ ACE_RCSID (Event, EC_ProxySupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection) @@ -529,3 +531,5 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( qos_info ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 769dc42ef80..00c54457491 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_ProxySupplier.h * @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushConsumer; @@ -218,6 +220,8 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i index d0e06a7b0a6..ca16bf8aeec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ ACE_INLINE void @@ -91,3 +93,5 @@ TAO_EC_ProxyPushSupplier::subscriptions (void) const return this->qos_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp index c53100ca0c6..01fbdb367ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp @@ -8,6 +8,8 @@ #include "EC_Proxy_Disconnector.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() ( RtecEventComm::PushSupplier_ptr supplier) @@ -41,3 +43,5 @@ TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() ( } ACE_ENDTRY; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index da6b6a2972e..64b0be5d827 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + /** * @file EC_Proxy_Disconnector.h * @@ -12,6 +14,8 @@ #include "orbsvcs/RtecEventCommC.h" #include "ace/Auto_Functor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @struct TAO_EC_Supplier_Proxy_Disconnect_Functor * @@ -67,4 +71,6 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Consumer_Proxy_Disconnector; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // EC_PROXY_DISCONNECTOR__H_ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 966ebb90667..27147c7e370 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_QOS_Info.h * @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_QOS_Info * @@ -56,6 +59,8 @@ public: long timer_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_QOS_Info.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i index 40a0f0facd8..eab42f031bc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_QOS_Info::TAO_EC_QOS_Info (void) : rt_info (-1), @@ -15,3 +19,5 @@ TAO_EC_QOS_Info::TAO_EC_QOS_Info (const TAO_EC_QOS_Info &rhs) timer_id_ (rhs.timer_id_) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 3de61363002..7d4ab3572a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -5,6 +5,8 @@ ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_RTCORBA_Dispatching:: TAO_EC_RTCORBA_Dispatching (const RTCORBA::ThreadpoolLanes &lanes, RTCORBA::PriorityMapping *mapping, @@ -100,3 +102,5 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, break; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index a4f80a3beb0..24450749ce9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_RTCORBA_Dispatching.h * @@ -26,6 +26,7 @@ #include "EC_Dispatching_Task.h" #include "tao/RTCORBA/RTCORBA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_EC_RTCORBA_Dispatching @@ -75,5 +76,7 @@ private: TAO_EC_Dispatching_Task *tasks_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_RTCORBA_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 02eaf4e219a..ccdf2294201 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -7,6 +7,8 @@ ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_RTCORBA_Factory:: TAO_EC_RTCORBA_Factory (TAO_EC_Factory *body, const RTCORBA::ThreadpoolLanes &lanes) @@ -271,3 +273,4 @@ TAO_EC_RTCORBA_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) this->body_->destroy_supplier_control (x); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index ef07e07bec9..9a5d39060f9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_RTCORBA_Factory.h * @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_RTCORBA_Factory * @@ -115,5 +117,7 @@ protected: RTCORBA::ThreadpoolLanes lanes_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_RTCORBA_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 8fe8f6cbcff..5bd92f5a821 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -17,6 +17,8 @@ ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Reactive_ConsumerControl:: TAO_EC_Reactive_ConsumerControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -270,3 +272,5 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier } ACE_ENDTRY; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index 1a3728d790f..32cafb85965 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Reactive_ConsumerControl.h * @@ -30,6 +30,8 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_Reactive_ConsumerControl; @@ -142,6 +144,8 @@ private: TAO_EC_ConsumerControl *control_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i index 08e2174e57d..d365ca2ae4d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Ping_Consumer::TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control) : control_ (control) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index ee376503697..6a1c4a72ceb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -5,6 +5,8 @@ ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void) : TAO_EC_Dispatching () { @@ -39,3 +41,5 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, { proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h index d5c3f56873d..07ced1c71e6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Reactive_Dispatching.h * @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Reactive_Dispatching * @@ -55,6 +58,8 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_REACTIVE_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index cdb3dc88a4d..57f0c1a60de 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -17,6 +17,8 @@ ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Reactive_SupplierControl:: TAO_EC_Reactive_SupplierControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -260,3 +262,5 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer } ACE_ENDTRY; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index cf0fdbc0a88..a66a677dd41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Reactive_SupplierControl.h * @@ -30,6 +31,8 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_Reactive_SupplierControl; @@ -152,6 +155,8 @@ private: TAO_EC_SupplierControl *control_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i index 0bd62d884aa..3ffaf226464 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i @@ -1,8 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Ping_Supplier::TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control) : control_ (control) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index 984ca0f7a7d..822b84f33ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -7,6 +7,8 @@ ACE_RCSID (Event, EC_Reactive_Timeout_Generator, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Reactive_Timeout_Generator:: TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor) : reactor_ (reactor) @@ -50,3 +52,5 @@ TAO_EC_Reactive_Timeout_Generator::cancel_timer ( return this->reactor_->cancel_timer (id, &vp); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h index 454596f6ef7..9a836a34cd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Reactive_Timeout_Generator.h * @@ -23,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Reactive_Timeout_Generator * @@ -60,6 +63,8 @@ private: TAO_EC_Timeout_Adapter event_handler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 47abbb9b9ed..6722ceaed03 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -17,6 +17,8 @@ ACE_RCSID(Event, EC_Sched_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void) { } @@ -210,6 +212,8 @@ TAO_EC_Sched_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base* ec) return this->TAO_EC_Sched_Factory::create_scheduling_strategy (ec); } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Sched_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h index 14901aba015..46970877f49 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Sched_Factory.h * @@ -24,6 +24,8 @@ #include "sched_event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Sched_Factory * @@ -56,6 +58,8 @@ public: private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Sched_Factory.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i index f3b79f082a5..84cbe2d4a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Sched_Factory::TAO_EC_Sched_Factory (void) : TAO_EC_Default_Factory () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 514d483c9ce..222ddc4ec00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -6,6 +6,8 @@ ACE_RCSID(Event, EC_Sched_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Sched_Filter:: TAO_EC_Sched_Filter (const char* name, RtecScheduler::handle_t rt_info, @@ -277,3 +279,5 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL) this->rt_info_computed_ = 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 5d428ad8f41..85e33bf958c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_Sched_Filter.h * @@ -26,6 +26,8 @@ #include "sched_event_export.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Sched_Filter * @@ -121,5 +123,7 @@ private: RtecScheduler::Info_Type_t info_type_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_SCHED_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 2070df1c0d0..64380dac04b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -16,6 +16,9 @@ ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void) { } @@ -328,3 +331,5 @@ TAO_EC_Sched_Filter_Builder:: } return i - 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index 229ee5a8ea5..b435aaaae73 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Sched_Filter_Builder.h * @@ -24,6 +25,8 @@ #include "sched_event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -76,6 +79,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Sched_Filter_Builder.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i index 06ca9c32485..a00dfd725c5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Sched_Filter_Builder:: TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel_Base *ec) : event_channel_ (ec) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index 311f0a86447..87d5b4dd405 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -5,6 +5,10 @@ ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index adc320a3167..d9ae7d91198 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Scheduling_Strategy.h * @@ -26,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_ProxyPushConsumer; class TAO_EC_ProxyPushSupplier; class TAO_EC_Supplier_Filter; @@ -63,6 +66,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_SCHEDULING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index f980f81485e..ea62768bca6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -10,6 +10,8 @@ ACE_RCSID(Event, EC_SupplierAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer,TAO_EC_ProxyPushSupplier> (ec) { @@ -33,3 +35,5 @@ TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 4b55624fcd7..0028d660e3f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_SupplierAdmin.h * @@ -27,6 +28,8 @@ #include /**/ "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; @@ -63,6 +66,8 @@ private: PortableServer::POA_var default_POA_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_SUPPLIERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index 94c7a2f58b0..fc1f5a0e459 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Event, EC_SupplierControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_SupplierControl::TAO_EC_SupplierControl (void) { } @@ -37,3 +39,4 @@ TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *, { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index 364a782928f..06065edab9d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_SupplierControl.h * @@ -24,6 +25,10 @@ #include /**/ "event_serv_export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_ProxyPushConsumer; namespace CORBA @@ -69,6 +74,8 @@ public: ACE_ENV_ARG_DECL_NOT_USED); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_SUPPLIERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 9267b8c4bbd..b80ec9317a4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -10,6 +10,8 @@ ACE_RCSID(Event, EC_Supplier_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) { } @@ -23,3 +25,5 @@ TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier TAO_EC_QOS_Info qos_info = this->event_info_; supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 081348d3a3a..503b04f2e0f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Supplier_Filter.h * @@ -26,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_ProxyPushSupplier; class TAO_EC_ProxyPushConsumer; class TAO_EC_QOS_Info; @@ -137,6 +140,8 @@ private: const TAO_EC_QOS_Info &event_info_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i index 4e4eae7779b..9b09afb3d74 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Filter_Worker::TAO_EC_Filter_Worker (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info) @@ -7,3 +11,5 @@ TAO_EC_Filter_Worker::TAO_EC_Filter_Worker (RtecEventComm::EventSet &event, event_info_ (event_info) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index a090b438772..0e1b93ac309 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -4,6 +4,10 @@ ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h index 627c07825c7..a90542dc22f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Supplier_Filter_Builder.h * @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Supplier_Filter; class TAO_EC_ProxyPushConsumer; @@ -55,6 +58,8 @@ public: destroy (TAO_EC_Supplier_Filter *filter) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index d90ca8c4678..a0fd451f08e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -13,6 +13,8 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$") #define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32 #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so) : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE) , queue_full_service_object_(so) @@ -192,3 +194,5 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h index ca00b72aa90..013707ef07d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_TPC_Dispatching.h * @@ -22,6 +23,8 @@ #include "EC_TPC_Dispatching_Task.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; /** @@ -75,5 +78,7 @@ private: // @@ check to see how the factory gets released... }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_TPC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp index 5de281b24cd..12585c54101 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp @@ -2,7 +2,8 @@ #include "EC_TPC_Dispatching_Task.h" -//ACE_RCS_ID(RTEvent, EC_TPC_Dispatching_Task, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task (ACE_Thread_Manager* thr_mgr, @@ -12,9 +13,10 @@ TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task } int -TAO_EC_TPC_Dispatching_Task::close (u_long flags) +TAO_EC_TPC_Dispatching_Task::close (u_long /* flags */) { - ACE_UNUSED_ARG (flags); delete this; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h index a952937da1f..d183f2f29b4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_TPC_Dispatching_Task.h * @@ -17,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTEvent_Serv_Export TAO_EC_TPC_Dispatching_Task : public TAO_EC_Dispatching_Task { public: @@ -25,5 +28,7 @@ public: virtual int close (u_long flags = 0); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_TPC_DISPATCHING_TASK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 4215d4d1f07..31c47f25425 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -14,6 +14,8 @@ ACE_RCSID(Event, EC_TPC_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + unsigned long EC_TPC_debug_level; TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void) @@ -106,6 +108,7 @@ TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec) return new TAO_EC_TPC_ProxyPushConsumer (ec); } +TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h index 5ece28d001c..1b66e955d74 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_TPC_Factory.h * @@ -16,6 +16,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_TPC_Factory * @@ -56,6 +58,8 @@ public: extern unsigned long EC_TPC_debug_level; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_EC_TPC_Factory) ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_TPC_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index c3abe25b30a..67e1da07b12 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -7,6 +7,8 @@ ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$") #include "EC_Event_Channel_Base.h" #include "EC_TPC_Dispatching.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern unsigned long EC_TPC_debug_level; TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec) @@ -49,3 +51,5 @@ TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ( BASECLASS::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h index a098c3f8c4e..ca594475c75 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_TPC_ProxyConsumer.h * @@ -18,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Dispatching; class TAO_EC_TPC_Dispatching; @@ -40,6 +43,8 @@ private: TAO_EC_TPC_Dispatching* tpc_dispatching (); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index b431002f2bb..5599d682b1e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -11,6 +11,8 @@ ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$") #include "EC_Event_Channel_Base.h" #include "EC_TPC_Dispatching.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern unsigned long EC_TPC_debug_level; TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void) @@ -71,3 +73,4 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer ( tpcdispatcher->add_consumer (push_consumer ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h index 0bb31a1698f..73d3f124718 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- /** * @file EC_TPC_ProxySupplier.h * @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Dispatching; class TAO_EC_TPC_Dispatching; @@ -51,6 +53,8 @@ private: TAO_EC_TPC_Dispatching* tpc_dispatching (); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_TPC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i index 7120a4017f2..6a31a5fc0d1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern unsigned long EC_TPC_debug_level; ACE_INLINE @@ -10,3 +14,4 @@ TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index e4e812f95b9..cb06272aeb2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -15,6 +15,8 @@ ACE_RCSID (Event, EC_Timeout_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( TAO_EC_Event_Channel_Base *event_channel, TAO_EC_ProxyPushSupplier *supplier, @@ -165,3 +167,5 @@ TAO_EC_Timeout_Filter::add_dependencies ( { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index 2b97409f85e..84e70df31f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Timeout_Filter.h * @@ -25,6 +26,8 @@ #include "EC_QOS_Info.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; @@ -106,6 +109,8 @@ private: long id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Timeout_Filter.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i index f47bb605f57..a6e30773801 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const TAO_EC_QOS_Info& TAO_EC_Timeout_Filter::qos_info (void) const { @@ -11,3 +15,5 @@ TAO_EC_Timeout_Filter::type (void) const { return this->type_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index caa5d55a189..56089a3605f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Event, EC_Timeout_Generator, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) { } @@ -55,3 +57,5 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h index 52eb6031054..e81377e9c00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Timeout_Generator.h * @@ -26,6 +27,8 @@ #include "EC_Timeout_Filter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_QOS_Info; /** @@ -87,6 +90,8 @@ private: const void *act); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EC_Timeout_Generator.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i index e5024c3fb1d..aba1263d609 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i @@ -1,6 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 3cf2b87baf0..8f943cb8e98 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$") // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Trivial_Supplier_Filter:: TAO_EC_Trivial_Supplier_Filter (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec) @@ -106,3 +108,5 @@ TAO_EC_Trivial_Supplier_Filter_Builder::destroy ( TAO_EC_Supplier_Filter*) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index 054905e1a49..4817c6315e2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Trivial_Supplier_Filter.h * @@ -26,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier_Set; @@ -99,6 +102,8 @@ private: TAO_EC_Trivial_Supplier_Filter filter_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index ef39e461f86..cc0e7ac7ec7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Event, EC_Type_Filter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header) : header_ (header) { @@ -145,3 +147,4 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, return 1; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 81d0882cf84..2b3ed11bc6a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Type_Filter.h * @@ -23,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Type_Filter * @@ -72,5 +75,7 @@ private: RtecEventComm::EventHeader header_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_TYPE_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 37374a6f760..eba83581c8d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -6,6 +6,8 @@ ACE_RCSID (Event, EC_UDP_Admin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port) : port_ (port) { @@ -19,8 +21,10 @@ void TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { addr.ipaddr = header.type; addr.port = this->port_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 0ce13cc24ad..1065bfd7fae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_UDP_Admin.h * @@ -19,6 +20,8 @@ #include "orbsvcs/RtecUDPAdminS.h" #include /**/ "event_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EC_Simple_AddrServer * @@ -51,5 +54,7 @@ private: CORBA::UShort port_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_UDP_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index d430e70b5f7..6a5e6836feb 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -25,6 +25,8 @@ #include "orbsvcs/Time_Utilities.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // = Predefined event types. All application defined types should be // relative to ACE_ES_EVENT_UNDEFINED. const long ACE_ES_EVENT_ANY = 0; @@ -75,6 +77,8 @@ const u_long ACE_Scheduler_MAX_SUB_PRIORITY = const u_long ACE_Scheduler_MIN_SUB_PRIORITY = ACE_Message_Block::MB_NORMAL; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_ES_CONSTANTS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 3d45c411eaf..4c66ec5087d 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -13,6 +13,8 @@ ACE_RCSID (orbsvcs, Event_Utilities, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_ConsumerQOS_Factory:: ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer) : designator_set_ (0), @@ -203,7 +205,7 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q for (u_int i = 0; i < qos.publications.length (); ++i) { - char buf[128]; + char buf[128] = { 0 }; ACE_OS::sprintf (buf, " publications[%d]", i); event_debug (buf, qos.publications[i].event); ACE_DEBUG ((LM_DEBUG, @@ -215,3 +217,5 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q ACE_DEBUG ((LM_DEBUG, "}\n")); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 9bc493d5ea3..cfc5727326f 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,9 @@ #include "Event/event_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + + typedef void (*TAO_EC_Event_Initializer) (RtecEventComm::Event&); /** @@ -242,6 +245,7 @@ private: TAO_EC_Event_Initializer event_initializer_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/Event_Utilities.i" diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.i index 0c2bcc74875..20c09b0a0fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.i @@ -1,6 +1,8 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source, @@ -146,3 +148,5 @@ ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (voi { return qos_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 11daa44e90d..6114de4f75b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "FT_ClientORBInitializer.h" @@ -13,13 +11,14 @@ ACE_RCSID (FaultTolerance, FT_ClientORBInitializer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_FT_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - } void @@ -112,3 +111,5 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index d5fd561e3ad..0537577a9c8 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -30,10 +30,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// FT ORB initializer. -class TAO_FT_ClientORB_Export TAO_FT_ClientORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_FT_ClientORBInitializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: @@ -60,6 +62,8 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 5a1b5dd4e2d..3b1d573830a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "FT_ClientPolicyFactory.h" @@ -11,6 +9,7 @@ ACE_RCSID (FaultTolerance, FT_ClientPolicyFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO_FT_ClientPolicyFactory::create_policy ( @@ -31,3 +30,5 @@ TAO_FT_ClientPolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 6d05145d5fc..72433ffab41 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -33,10 +33,12 @@ #include "FT_ClientORB_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all FTCORBA related policies. -class TAO_FT_ClientORB_Export TAO_FT_ClientPolicyFactory : - public PortableInterceptor::PolicyFactory, - public TAO_Local_RefCounted_Object +class TAO_FT_ClientPolicyFactory + : public PortableInterceptor::PolicyFactory + , public TAO_Local_RefCounted_Object { public: @@ -47,6 +49,8 @@ public: CORBA::PolicyError)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index 2acb4be7939..20a229a0ccf 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -12,6 +12,8 @@ ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TimeBase::TimeT TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -188,3 +190,4 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 02e9ac09308..2dd5abc2e23 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file FT_ClientPolicy_i.h @@ -24,6 +25,8 @@ #include "tao/LocalObject.h" #include "FT_ClientORB_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_FT_Request_Duration_Policy * @@ -39,7 +42,7 @@ * to keep trying to connect to server object groups under certain * conditions. */ -class TAO_FT_ClientORB_Export TAO_FT_Request_Duration_Policy +class TAO_FT_Request_Duration_Policy : public FT::RequestDurationPolicy, public TAO_Local_RefCounted_Object { @@ -92,7 +95,7 @@ private: * If this policy is set, it enables the client ORB to send * heartbeats to the server ORB over the open connections. */ -class TAO_FT_ClientORB_Export TAO_FT_Heart_Beat_Policy +class TAO_FT_Heart_Beat_Policy : public FT::HeartbeatPolicy, public TAO_Local_RefCounted_Object { @@ -147,6 +150,8 @@ private: TimeBase::TimeT heartbeat_timeout_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl index 7b63b76de72..7644c34c231 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl @@ -1,4 +1,9 @@ +// -*- C++ -*- +// //$Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy ( const TimeBase::TimeT &duration @@ -47,4 +52,4 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( { } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index f914c45ae99..351277b62f9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -20,6 +20,8 @@ ACE_RCSID (FaultTolerance, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void) @@ -435,3 +437,5 @@ namespace TAO return t; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h index 67dff801d64..054d9a98ed5 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file FT_ClientRequest_Interceptor.h @@ -37,6 +38,8 @@ namespace ACE_Utils class UUID; } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -63,7 +66,7 @@ namespace TAO * * @@TODO */ - class TAO_FT_ClientORB_Export FT_ClientRequest_Interceptor + class FT_ClientRequest_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual TAO_Local_RefCounted_Object { @@ -71,8 +74,6 @@ namespace TAO FT_ClientRequest_Interceptor (void); - ~FT_ClientRequest_Interceptor (void); - /// Canonical name of the interceptor. virtual char * name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -104,6 +105,10 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + protected: + + ~FT_ClientRequest_Interceptor (void); + private: void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri @@ -133,6 +138,9 @@ namespace TAO CORBA::Long retention_id_; }; } + +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index 4dc19d2f66a..fd70ea58531 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -11,6 +11,8 @@ ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$") static bool initialized = false; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void) { } @@ -67,6 +69,8 @@ TAO_FT_ClientService_Activate::Initializer (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_FT_ClientORB,TAO_FT_ClientService_Activate) ACE_STATIC_SVC_DEFINE (TAO_FT_ClientService_Activate, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index feb04749ae6..9aa5e0d7889 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file FT_ClientService_Activate.h @@ -23,6 +25,8 @@ #include "tao/Services_Activate.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Service_Callbacks; // Forward declarations @@ -55,14 +59,15 @@ public: /// Used to force the initialization. static int Initializer (void); - }; -ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate) -ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate) - static int TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate) +ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate) + #include /**/ "ace/post.h" #endif /*TAO_FT_CLIENTACTIVATE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index bd37bc897c2..adfc55d3e05 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -10,16 +10,16 @@ ACE_RCSID (FaultTolerance, FT_Endpoint_Selector_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void) - :ft_endpoint_selector_ (0) + : ft_endpoint_selector_ (0) { } TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void) { - if (this->ft_endpoint_selector_) - delete this->ft_endpoint_selector_; + delete this->ft_endpoint_selector_; } @@ -47,6 +47,8 @@ TAO_FT_Endpoint_Selector_Factory::get_selector ( return this->ft_endpoint_selector_; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_FT_Endpoint_Selector_Factory, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index dd7e9c57751..a93b31b0da3 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -7,7 +7,6 @@ * $Id$ * * @author Balachandran Natarajan <bala@cs.wustl.edu> - * */ //============================================================================= #ifndef TAO_FT_ENDPOINT_SELECTOR_FACTORY_H @@ -27,6 +26,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FT_Invocation_Endpoint_Selector; /** * @class TAO_FT_Endpoint_Selector_Factory @@ -64,6 +65,8 @@ private: TAO_SYNCH_MUTEX mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + //extern TAO_FT_ClientORB_Export ACE_Static_Svc_Descriptor ace_svc_desc_TAO_FT_Endpoint_Selector_Factory; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index ddadd6e6cca..09a2bb56a87 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -19,6 +19,7 @@ ACE_RCSID (FaultTolerance, # include "FT_IOGR_Property.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_FT_IOGR_Property::set_property ( @@ -423,3 +424,5 @@ TAO_FT_IOGR_Property::remove_primary_tag ( } return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index b98dc52a200..6c91f3c66d0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -33,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Profile; /** @@ -131,6 +133,7 @@ private: FT::TagFTGroupTaggedComponent *ft_group_tagged_component_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i deleted file mode 100644 index 43e3c57df8d..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i +++ /dev/null @@ -1,31 +0,0 @@ -// -*- C++ -*- -// -//$Id$ - -ACE_INLINE -TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( - FT::TagFTGroupTaggedComponent &ft_group) - :ft_group_tagged_component_ (&ft_group) -{ -} - -ACE_INLINE -TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void) - :ft_group_tagged_component_ (0) -{ -} - -ACE_INLINE -TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void) -{ -} - -ACE_INLINE CORBA::Boolean -TAO_FT_IOGR_Property::reset_tagged_components ( - FT::TagFTGroupTaggedComponent &ft_group) -{ - this->ft_group_tagged_component_ = - &ft_group; - - return 1; -} diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl index 43e3c57df8d..5e3a8417714 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl @@ -2,6 +2,8 @@ // //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( FT::TagFTGroupTaggedComponent &ft_group) @@ -29,3 +31,5 @@ TAO_FT_IOGR_Property::reset_tagged_components ( return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 4545579404e..47891f3bba4 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -15,6 +15,8 @@ ACE_RCSID (FaultTolerance, FT_Invocation_Endpoint_Selectors, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void) : TAO_Default_Endpoint_Selector () { @@ -229,3 +231,5 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index 0b737f36a92..3b0f561649d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -29,6 +29,8 @@ #include "tao/Basic_Types.h" #include "tao/ORB_Constants.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Profile; /** @@ -87,6 +89,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* FT_TAO_INVOCATION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index 1060bbacfba..b5fe34cb281 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -13,13 +13,15 @@ ACE_RCSID (FaultTolerance, FT_ORBInitializer, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_FT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - } void @@ -39,9 +41,6 @@ TAO_FT_ORBInitializer::post_init ( this->register_client_request_interceptors (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - - - } void @@ -137,3 +136,5 @@ TAO_FT_ORBInitializer::register_client_request_interceptors ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index e6ca50c065c..69be6a9a3da 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -31,10 +31,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// RTCORBA ORB initializer. -class TAO_FT_Export TAO_FT_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_FT_ORBInitializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: @@ -66,6 +68,8 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index 2072fe7bbd1..dc0f72f1d3f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -10,8 +10,7 @@ ACE_RCSID (FaultTolerance, FT_PolicyFactory, "$Id$") - - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO_FT_PolicyFactory::create_policy ( @@ -35,3 +34,5 @@ TAO_FT_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h index 486581ad26a..e108bcae507 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h @@ -35,10 +35,12 @@ #include "fault_tol_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all FTCORBA related policies. -class TAO_FT_Export TAO_FT_PolicyFactory : - public PortableInterceptor::PolicyFactory, - public TAO_Local_RefCounted_Object +class TAO_FT_PolicyFactory + : public PortableInterceptor::PolicyFactory + , public TAO_Local_RefCounted_Object { public: @@ -49,6 +51,8 @@ public: CORBA::PolicyError)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 09f2735fd09..f579b080941 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -9,6 +9,8 @@ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TimeBase::TimeT TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -253,3 +255,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index 36458e3e3bf..6042643f223 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file FT_Policy_i.h @@ -21,6 +22,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_END_VERSIONED_NAMESPACE_DECL /** * @class TAO_FT_Request_Duration_Policy * @@ -36,7 +39,7 @@ * to keep trying to connect to server object groups under certain * conditions. */ -class TAO_FT_Export TAO_FT_Request_Duration_Policy +class TAO_FT_Request_Duration_Policy : public FT::RequestDurationPolicy, public TAO_Local_RefCounted_Object { @@ -198,6 +201,8 @@ private: CORBA::Boolean heartbeat_enabled_value_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i deleted file mode 100644 index 4caf44a0faf..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i +++ /dev/null @@ -1,70 +0,0 @@ -//$Id$ -ACE_INLINE -TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy ( - const TimeBase::TimeT &duration - ) - : request_duration_ (duration) -{ -} - -ACE_INLINE -TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy ( - const TAO_FT_Request_Duration_Policy &rhs - ) - : ACE_NESTED_CLASS (CORBA, Object) (), - ACE_NESTED_CLASS (CORBA, Policy) (), - ACE_NESTED_CLASS (CORBA, LocalObject) (), - FT::RequestDurationPolicy (), - TAO_Local_RefCounted_Object (), - request_duration_ (rhs.request_duration_) -{ -} - -ACE_INLINE -TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( - const CORBA::Boolean heartbeat, - const TimeBase::TimeT &interval, - const TimeBase::TimeT &timeout - ) - : heartbeat_ (heartbeat), - heartbeat_interval_ (interval), - heartbeat_timeout_ (timeout) -{ -} - -ACE_INLINE -TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( - const TAO_FT_Heart_Beat_Policy &rhs - ) - : ACE_NESTED_CLASS (CORBA, Object) (), - ACE_NESTED_CLASS (CORBA, Policy) (), - ACE_NESTED_CLASS (CORBA, LocalObject) (), - FT::HeartbeatPolicy (), - TAO_Local_RefCounted_Object (), - heartbeat_ (rhs.heartbeat_), - heartbeat_interval_ (rhs.heartbeat_interval_), - heartbeat_timeout_ (rhs.heartbeat_timeout_) -{ -} - - -ACE_INLINE -TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( - const CORBA::Boolean heartbeat - ) - : heartbeat_enabled_value_ (heartbeat) -{ -} - -ACE_INLINE -TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( - const TAO_FT_Heart_Beat_Enabled_Policy &rhs - ) - : ACE_NESTED_CLASS (CORBA, Object) (), - ACE_NESTED_CLASS (CORBA, Policy) (), - ACE_NESTED_CLASS (CORBA, LocalObject) (), - FT::HeartbeatEnabledPolicy (), - TAO_Local_RefCounted_Object (), - heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) -{ -} diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl index 579d6c3467b..3aa80e1b0a1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl @@ -1,4 +1,9 @@ +// -*- C++ -*- +// //$Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::TimeT &duration) :ACE_NESTED_CLASS (CORBA, Object) () @@ -71,3 +76,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 117b2e95280..9351efc0b7c 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "FT_ServerORBInitializer.h" @@ -13,13 +11,15 @@ ACE_RCSID (FaultTolerance, FT_ServerORBInitializer, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_FT_ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - } void @@ -35,7 +35,6 @@ TAO_FT_ServerORBInitializer::post_init ( this->register_server_request_interceptors (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - } void @@ -98,3 +97,4 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors ( } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index 6f88080afd2..cf9ef903306 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -30,10 +30,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// RTCORBA ORB initializer. -class TAO_FT_ServerORB_Export TAO_FT_ServerORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_FT_ServerORBInitializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: @@ -61,6 +63,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index e6269801482..9f6c4a2230a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -12,6 +12,8 @@ ACE_RCSID (FaultTolerance, FT_ServerPolicyFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy_ptr TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, @@ -28,3 +30,5 @@ TAO_FT_ServerPolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index fc1cb12b093..09a6d64d6f7 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -33,10 +33,12 @@ #include "FT_ServerORB_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all FTCORBA related policies. -class TAO_FT_ServerORB_Export TAO_FT_ServerPolicyFactory : - public PortableInterceptor::PolicyFactory, - public TAO_Local_RefCounted_Object +class TAO_FT_ServerPolicyFactory + : public PortableInterceptor::PolicyFactory + , public TAO_Local_RefCounted_Object { public: @@ -47,11 +49,12 @@ public: CORBA::PolicyError)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TAO_FT_POLICY_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 9a12142d0e0..4f42bde34cb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -11,6 +11,8 @@ ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Boolean TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -71,9 +73,10 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const return copy; } - void TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 4a69e2db662..ee54acfefae 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file FT_ServerPolicy_i.h @@ -24,6 +25,7 @@ #include "FT_ServerORB_export.h" #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_FT_Heart_Beat_Enabled_Policy @@ -34,9 +36,9 @@ * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of * the IOR that it exposes */ -class TAO_FT_ServerORB_Export TAO_FT_Heart_Beat_Enabled_Policy - : public FT::HeartbeatEnabledPolicy, - public TAO_Local_RefCounted_Object +class TAO_FT_Heart_Beat_Enabled_Policy + : public FT::HeartbeatEnabledPolicy + , public TAO_Local_RefCounted_Object { public: @@ -79,6 +81,8 @@ private: CORBA::Boolean heartbeat_enabled_value_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl index d8dd25b8384..8f4f0b93709 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( const CORBA::Boolean heartbeat @@ -20,3 +24,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index f082c613dd9..01417950ea4 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- - #include "FT_ServerRequest_Interceptor.h" #include "tao/IOP_IORC.h" #include "tao/ORB_Constants.h" @@ -14,6 +12,8 @@ ACE_RCSID (FaultTolerance, FT_ServerRequest_Interceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void) @@ -28,7 +28,6 @@ namespace TAO { } - char * FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -233,3 +232,5 @@ namespace TAO ACE_THROW (CORBA::TRANSACTION_ROLLEDBACK ()); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 230267e209a..939c3fed7f2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -32,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace IOP { struct ServiceContext; @@ -45,9 +47,9 @@ namespace TAO * * */ - class TAO_FT_ServerORB_Export FT_ServerRequest_Interceptor - : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + class FT_ServerRequest_Interceptor + : public virtual PortableInterceptor::ServerRequestInterceptor + , public virtual TAO_Local_RefCounted_Object { public: @@ -128,6 +130,9 @@ namespace TAO }; } + +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index 3047cec219d..826d4d06edb 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -9,6 +9,8 @@ ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$") static bool initialized = false; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void) { } @@ -17,8 +19,6 @@ TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void) { } - - int TAO_FT_ServerService_Activate::Initializer (void) { @@ -43,6 +43,8 @@ TAO_FT_ServerService_Activate::Initializer (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_FT_ServerORB,TAO_FT_ServerService_Activate) ACE_STATIC_SVC_DEFINE (TAO_FT_ServerService_Activate, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index 3f85518f093..df27b2c2009 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file FT_ServerService_Activate.h @@ -23,6 +25,8 @@ #include "tao/Services_Activate.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Service_Callbacks; // Forward declarations @@ -33,7 +37,8 @@ class TAO_Service_Callbacks; * to the ORB. * */ -class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object +class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate +: public ACE_Service_Object { public: @@ -48,11 +53,13 @@ public: }; -ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate) -ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate) - static int TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate) +ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate) + #include /**/ "ace/post.h" #endif /*TAO_FT_ACTIVATE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index fea264b08f1..18c94f4bce1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -10,6 +10,8 @@ ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$") static bool initialized = false; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FT_Service_Activate::TAO_FT_Service_Activate (void) { } @@ -18,7 +20,6 @@ TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void) { } - TAO_Service_Callbacks * TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -66,6 +67,8 @@ TAO_FT_Service_Activate::Initializer (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_FT,TAO_FT_Service_Activate) ACE_STATIC_SVC_DEFINE (TAO_FT_Service_Activate, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 1fb8e66e7f3..21d8ef638d4 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -18,6 +18,9 @@ ACE_RCSID (FaultTolerance, FT_Service_Callbacks, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks ( TAO_ORB_Core *orb_core) @@ -253,3 +256,5 @@ TAO_FT_Service_Callbacks::now (void) // Add the offset to convert from posix time. return (sec_part + usec_part + ACE_UINT64_LITERAL (0x1B21DD213814000)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index c05c36eac39..3fe34415887 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file FT_Service_Callbacks.h @@ -23,6 +25,8 @@ #include "tao/Service_Callbacks.h" #include "orbsvcs/FT_CORBA_ORBC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Profile; class TAO_MProfile; class TAO_ORB_Core; @@ -89,5 +93,8 @@ private: ACE_Lock* profile_lock_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /*TAO_FT_CALLBACKS_H*/ diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index f630b551219..934e298c38e 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -10,6 +10,8 @@ ACE_RCSID (orbsvcs, IOR_Multicast, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_HANDLE TAO_IOR_Multicast::get_handle (void) const { @@ -315,4 +317,4 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) return 0; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index 013fcebf5af..9963e2fa222 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #include "ace/Reactor.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler { // = TITLE @@ -105,5 +108,7 @@ private: ACE_CString mcast_nic_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IOR_MULTICAST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index e64a40bbf31..cb4110ac0f1 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -3715,7 +3715,6 @@ libTAO_RTEvent_Serv_la_CPPFLAGS = \ libTAO_RTEvent_Serv_la_SOURCES = \ Event/ECG_Adapters.cpp \ - Event/ECG_Address_Server_Base.cpp \ Event/ECG_CDR_Message_Receiver.cpp \ Event/ECG_CDR_Message_Sender.cpp \ Event/ECG_Complex_Address_Server.cpp \ diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc index 3c19e408e47..6590376426c 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc @@ -11,7 +11,6 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging { Source_Files { Event/ECG_Adapters.cpp - Event/ECG_Address_Server_Base.cpp Event/ECG_CDR_Message_Receiver.cpp Event/ECG_CDR_Message_Sender.cpp Event/ECG_Complex_Address_Server.cpp diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 57df6a30ee3..cc6cd3494f2 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -8,7 +8,9 @@ ACE_RCSID (orbsvcs, Runtime_Scheduler, "$Id$") - // Constructor. Initialize the data from the POD_RT_Info array. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// Constructor. Initialize the data from the POD_RT_Info array. ACE_Runtime_Scheduler:: ACE_Runtime_Scheduler (int config_count, @@ -548,3 +550,5 @@ ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*co // or a proprietary ACE_NOTSUP; -- Bala ACE_THROW (CORBA::NO_IMPLEMENT ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index caf18c8b441..e0ca3e545ea 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ // ============================================================================ @@ -22,6 +23,8 @@ #include "orbsvcs/RtecSchedulerS.h" #include "orbsvcs/Sched/sched_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler { // = TITLE @@ -279,5 +282,7 @@ private: // The array of precomputed RT_Info structures. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_RUNTIME_SCHEDULER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp index 3de15da1e53..ed2f37b7f13 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp @@ -6,6 +6,8 @@ ACE_RCSID(orbsvcs, Shutdown_Utilities, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf) : functor_(sf) { @@ -80,3 +82,5 @@ Service_Shutdown::handle_signal (int signum, this->functor_(signum); return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h index a91705d3401..78f52a09663 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h @@ -1,14 +1,20 @@ +// -*- C++ -*- + #ifndef _SHUTDOWN_UTILS_H #define _SHUTDOWN_UTILS_H #include /**/ "ace/pre.h" // $Id$ -#include <ace/Event_Handler.h> -#include <ace/Signal.h> - #include "orbsvcs/svc_utils_export.h" +#include "tao/Versioned_Namespace.h" + +#include "ace/Event_Handler.h" +#include "ace/Signal.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * \brief Abstract definition for a Functor that shuts down a particular service. * @@ -56,5 +62,7 @@ protected: ACE_Sig_Handler shutdown_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index d47168b1212..80152580eb5 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -8,6 +8,8 @@ ACE_RCSID(orbsvcs, Time_Utilities, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Number of nanoseconds between CORBA and POSIX epochs. #ifdef ACE_LACKS_LONGLONG_T const ACE_UINT64 @@ -16,3 +18,5 @@ ORBSVCS_Time::Time_Base_Offset(0x82B60000, 0x0A990E2D6); const ACE_UINT64 ORBSVCS_Time::Time_Base_Offset(ACE_UINT64_LITERAL(12218515200000000000)); #endif + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index f342e67b3df..8a471f31521 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -22,6 +23,8 @@ #include "orbsvcs/svc_utils_export.h" #include "ace/OS_NS_time.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ORBSVCS_Time * @@ -98,6 +101,8 @@ private: static const ACE_UINT64 Time_Base_Offset; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "orbsvcs/Time_Utilities.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i index 27ea1cdde34..f7531f657f3 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i @@ -4,6 +4,8 @@ #include "ace/Time_Value.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TimeBase::TimeT ORBSVCS_Time::zero () { @@ -97,3 +99,5 @@ ORBSVCS_Time::to_Absolute_Time_Value (const TimeBase::TimeT& t) ORBSVCS_Time::Absolute_TimeT_to_Time_Value (r, t); return r; } + +TAO_END_VERSIONED_NAMESPACE_DECL |