diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-12 09:37:58 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-12 09:37:58 +0000 |
| commit | 6f35186f1881fd76312acec1006edfeed8dc6b37 (patch) | |
| tree | 9027961b26b76973669e0e727aa0ae2354875819 | |
| parent | acbed053de34e1eb0be53b48a97fd9ab0c17d6ac (diff) | |
| download | ATCD-6f35186f1881fd76312acec1006edfeed8dc6b37.tar.gz | |
ChangeLogTag:Sat Nov 12 01:34:26 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
280 files changed, 1577 insertions, 313 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 724f027e662..2ffebb4ec11 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,290 @@ +Sat Nov 12 01:34:26 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/CosLoadBalancing.mpc: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp: + + Removed empty LoadBalancing/*Map.cpp source files. + + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl: + * orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl: + * orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h: + * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp: + * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h: + * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/AliasDef_i.h: + * orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h: + * orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/AttributeDef_i.h: + * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp: + * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h: + * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h: + * orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h: + * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp: + * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h: + * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ConstantDef_i.h: + * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h: + * orbsvcs/orbsvcs/IFRService/Contained_i.cpp: + * orbsvcs/orbsvcs/IFRService/Contained_i.h: + * orbsvcs/orbsvcs/IFRService/Container_i.cpp: + * orbsvcs/orbsvcs/IFRService/Container_i.h: + * orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/EmitsDef_i.h: + * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/EnumDef_i.h: + * orbsvcs/orbsvcs/IFRService/EventDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/EventDef_i.h: + * orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h: + * orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/FactoryDef_i.h: + * orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/FinderDef_i.h: + * orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/FixedDef_i.h: + * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/HomeDef_i.h: + * orbsvcs/orbsvcs/IFRService/IDLType_i.cpp: + * orbsvcs/orbsvcs/IFRService/IDLType_i.h: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h: + * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp: + * orbsvcs/orbsvcs/IFRService/IRObject_i.h: + * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp: + * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h: + * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h: + * orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/NativeDef_i.h: + * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/OperationDef_i.h: + * orbsvcs/orbsvcs/IFRService/Options.cpp: + * orbsvcs/orbsvcs/IFRService/Options.h: + * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h: + * orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/RecursDef_i.h: + * orbsvcs/orbsvcs/IFRService/Repository_i.cpp: + * orbsvcs/orbsvcs/IFRService/Repository_i.h: + * orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h: + * orbsvcs/orbsvcs/IFRService/StringDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/StringDef_i.h: + * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/StructDef_i.h: + * orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h: + * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/UnionDef_i.h: + * orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/UsesDef_i.h: + * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h: + * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ValueDef_i.h: + * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h: + * orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/WstringDef_i.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Component.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl: + * orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Random.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_conf.h: + + Added versioned namespace support. + Fri Nov 11 08:55:05 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h: diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index 88c5793a5a5..bb3f07b2480 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -22,14 +22,9 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, LoadBalancing/LB_LoadAverage.cpp LoadBalancing/LB_LoadAlert.cpp LoadBalancing/LB_LoadAlertInfo.cpp - LoadBalancing/LB_LoadAlertMap.cpp LoadBalancing/LB_LoadAlert_Handler.cpp - LoadBalancing/LB_LoadListMap.cpp LoadBalancing/LB_LoadManager.cpp - LoadBalancing/LB_LoadMap.cpp - LoadBalancing/LB_Location_Index_Map.cpp LoadBalancing/LB_MemberLocator.cpp - LoadBalancing/LB_MonitorMap.cpp LoadBalancing/LB_Pull_Handler.cpp LoadBalancing/LB_Random.cpp LoadBalancing/LB_RoundRobin.cpp diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index 8f207a5b953..7aa93637673 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -7,11 +7,10 @@ ACE_RCSID (ClientORB, FTRT_ClientORB_Initializer, "$Id$") -#include "tao/debug.h" - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth) -: client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) ) + : client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) ) { } @@ -33,4 +32,4 @@ FTRT_ClientORB_Initializer::post_init ( ACE_ENV_ARG_PARAMETER); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index 3667ea1db7b..7bfd0791eb1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -31,10 +31,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// RTCORBA ORB initializer. -class FTRT_ClientORB_Initializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class FTRT_ClientORB_Initializer + : public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: /// Priority mapping types @@ -51,6 +53,8 @@ private: PortableInterceptor::ClientRequestInterceptor_var client_interceptor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 14cd1f6dbec..97d221936fe 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -10,6 +10,8 @@ ACE_RCSID (ClientORB, FTRT_ClientORB_Interceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRT { const unsigned FT_TRANSACTION_DEPTH = 30; const unsigned FT_FORWARD = 32; @@ -45,7 +47,6 @@ FTRT_ClientORB_Interceptor::send_poll ( ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - // Do Nothing } void @@ -150,10 +151,11 @@ FTRT_ClientORB_Interceptor::receive_other ( void FTRT_ClientORB_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri + PortableInterceptor::ClientRequestInfo_ptr /* ri */ ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - ACE_UNUSED_ARG(ri); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index 98cbc108bbe..81512859796 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -33,6 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FTRT_ClientORB_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, @@ -79,6 +80,8 @@ private: CORBA::Long transaction_depth_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index 847b12d8284..1f56e5409d5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -14,6 +14,8 @@ ACE_RCSID (ClientORB, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRT { FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void) { @@ -82,9 +84,13 @@ namespace TAO_FTRT { return 0; } +} + +TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// +namespace TAO_FTRT { ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader) ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader, ACE_TEXT ("FTRT_ClientORB_Service"), diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index 9e64f2d288c..24c9585322a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -26,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; namespace TAO_FTRT { @@ -43,8 +45,11 @@ namespace TAO_FTRT { virtual int init (int argc, ACE_TCHAR* []); }; +} +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO_FTRT { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader) ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader) ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 829c5c7d093..3c2c6a027e6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -17,8 +17,11 @@ ACE_RCSID (EventChannel, AMI_Primary_Replication_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + AMI_Primary_Replication_Strategy::AMI_Primary_Replication_Strategy(bool mt) -: handler_(this), mutex_(mt ? new ACE_SYNCH_RW_MUTEX : 0) + : handler_(this), + mutex_ (mt ? new ACE_SYNCH_RW_MUTEX : 0) { } @@ -215,3 +218,5 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, event.wait(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index 07caec84c43..eae8337d4b1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class AMI_Primary_Replication_Strategy. * @@ -60,4 +62,6 @@ private: ACE_SYNCH_RW_MUTEX* mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // AMI_PRIMARY_REPLICATION_STRATEGY_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index c9dee536cf3..9e0df5cb9c4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -10,9 +10,10 @@ ACE_RCSID (EventChannel, AMI_Replication_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt) -: mt_(mt) + : mt_(mt) { } @@ -66,3 +67,5 @@ int AMI_Replication_Strategy::release (void) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 28e38c23db7..89727a60a40 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -23,14 +23,14 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Task.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class AMI_Replication_Strategy. * * @brief Used by backup replicas when AMI calls are used for replicating requests. */ - -class AMI_Replication_Strategy: public Replication_Strategy +class AMI_Replication_Strategy : public Replication_Strategy { public: /** @@ -54,5 +54,6 @@ private: bool mt_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 6a54016e227..20c451ead09 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -10,12 +10,14 @@ ACE_RCSID (EventChannel, Basic_Replication_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// The mutex has to be recursive; otherwise, if the second replicate_request() is /// called while the first replicate_request() is waiting for reply, we will get /// a deadlock. Basic_Replication_Strategy::Basic_Replication_Strategy(bool mt) -: sequence_num_(0) -, mutex_(mt ? new ACE_SYNCH_RECURSIVE_MUTEX : 0) + : sequence_num_(0) + , mutex_(mt ? new ACE_SYNCH_RECURSIVE_MUTEX : 0) { } @@ -152,3 +154,5 @@ int Basic_Replication_Strategy::release (void) { return mutex_ ? mutex_->release() : 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h index d75089fbaf0..4ef8582aff9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class Basic_Replication_Strategy * @@ -52,4 +54,6 @@ private: ACE_SYNCH_RECURSIVE_MUTEX* mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index 1ac36e19653..a14d2c327eb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -1,5 +1,7 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <ACE_PEER_STREAM_1> int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor) { @@ -91,3 +93,4 @@ int ConnectionDetectHandler<ACE_PEER_STREAM_2>::close (u_long ) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index 27e5bd379ee..cb454447a22 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -19,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <ACE_PEER_STREAM_1> class ConnectionAcceptHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> { @@ -53,6 +57,8 @@ private: TAO_FTEC_Fault_Listener* listener_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ConnectionHandler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp index ae9cc29a74f..adaf011b0b4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp @@ -13,6 +13,8 @@ inline unsigned ceil(unsigned numerator, unsigned denominator) return numerator/denominator+ (numerator%denominator ? 1 : 0); } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Dynamic_Bitset::Dynamic_Bitset(Dynamic_Bitset::size_type size) : buffer_size_(ceil(size,BITS_PER_BLOCK)) , bit_size_(size) @@ -119,3 +121,5 @@ bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs) mask >>= (Dynamic_Bitset::BITS_PER_BLOCK-bit_pos); return ((lhs.buffer_[i] ^ rhs.buffer_[i]) & mask ) == 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h index 980edb46fce..360ccfc02c5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h @@ -13,12 +13,15 @@ #define DYNAMIC_BITSET_H #include "ace/config-all.h" + +#include "tao/Versioned_Namespace.h" #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * */ - class Dynamic_Bitset { typedef unsigned block; @@ -64,6 +67,8 @@ private: bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs); Dynamic_Bitset operator & (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs); +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Dynamic_Bitset.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl index 19bc921fb7d..d9a1168d994 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl @@ -10,6 +10,8 @@ */ //============================================================================= +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE Dynamic_Bitset::~Dynamic_Bitset() { @@ -64,3 +66,4 @@ Dynamic_Bitset::reference Dynamic_Bitset::operator[](Dynamic_Bitset::size_type b return Dynamic_Bitset::reference(this, bit); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp index b378fb7d71c..b072a2653fd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp @@ -2,7 +2,10 @@ #include "FTEC_Become_Primary_Listener.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FTEC_Become_Primary_Listener::~TAO_FTEC_Become_Primary_Listener() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h index 87f4f8cb889..8d1a7232e54 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h @@ -15,6 +15,10 @@ #include "ftrtec_export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTRTEC_Export TAO_FTEC_Become_Primary_Listener { public: @@ -22,4 +26,6 @@ public: virtual void become_primary()=0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_FTEC_BECOME_PRIMARY_LISTENER_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index fa2c3cf0dbd..2117d7e4bcb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -10,6 +10,8 @@ ACE_RCSID (EventChannel, TAO_FTEC_ConsumerAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const FtRtecEventChannelAdmin::OperationType TAO_FTEC_ConsumerAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_SUPPLIER; @@ -46,3 +48,4 @@ TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index 267162a8b4b..ff28bdb222e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -21,6 +21,8 @@ #include "FT_ProxyAdmin_T.h" #include "ProxySupplierStateWorker.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FtRtecEventChannelAdmin { struct ConsumerAdminState; } @@ -65,5 +67,7 @@ public: void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_CONSUMERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index aef9a1f62e5..fd7123d8617 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -19,11 +19,13 @@ ACE_RCSID (EventChannel, TAO_FTEC_Event_Channel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FTEC_Event_Channel::TAO_FTEC_Event_Channel(CORBA::ORB_var orb, PortableServer::POA_var poa) -: orb_(orb) -, poa_(poa) -, ec_impl_(NULL) + : orb_(orb) + , poa_(poa) + , ec_impl_(NULL) { } @@ -404,7 +406,7 @@ TAO_FTEC_Event_Channel::resume_push_supplier ( )) { ec_impl_->resume_push_supplier(oid - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void @@ -418,7 +420,9 @@ TAO_FTEC_Event_Channel::push ( , FtRtecEventComm::InvalidObjectID )) { - ec_impl_->push(oid, data - ACE_ENV_ARG_PARAMETER); + ec_impl_->push(oid, + data + ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index ff7d20f47ff..3daf68143e0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -19,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; class TAO_FTEC_Become_Primary_Listener; @@ -177,4 +179,6 @@ private: TAO_FTEC_Event_Channel_Impl* ec_impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 73c5ff4fce7..70398c48662 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -18,6 +18,8 @@ ACE_RCSID (EventChannel, FTEC_Event_Channel_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op ACE_ENV_ARG_DECL) @@ -215,7 +217,7 @@ typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op ACE_ENV_ARG_DECL); -Set_update_fun update_table[] = { +Set_update_fun const update_table[] = { &obtain_push_supplier, &obtain_push_consumer, &disconnect_push_supplier, @@ -576,3 +578,5 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd ACE_ENDTRY; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index 4ddb93d6450..55bca7d95f3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_ProxyPushSupplier; class TAO_FTEC_ProxyPushConsumer; class TAO_FTEC_SupplierAdmin; @@ -128,4 +130,6 @@ private: IOGR_Maker iogr_maker_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index b46188a9458..4fe0ad267cf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -11,6 +11,8 @@ ACE_RCSID (EventChannel, FTEC_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void) { } @@ -51,3 +53,4 @@ TAO_FTEC_Basic_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* p delete proxy; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h index d253716dba1..5fd7cb8e131 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -18,6 +18,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory { public: @@ -40,5 +43,7 @@ public: destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h index a2106a68aa3..c2eb737544e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h @@ -13,6 +13,9 @@ #ifndef TAO_FTEC_FAULT_LISTENER_H #define TAO_FTEC_FAULT_LISTENER_H +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_FTEC_Fault_Listener { @@ -21,4 +24,6 @@ public: virtual void connection_closed()=0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 5d2e55109a9..d690bb1a1c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -15,6 +15,7 @@ ACE_RCSID (EventChannel, TAO_FTEC_Group_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL int find_by_location(const FTRT::ManagerInfoList& list, const FTRT::Location & location) @@ -374,4 +375,4 @@ void TAO_FTEC_Group_Manager::connection_closed() } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index f2720fa1393..7d13567b453 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -20,6 +20,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + struct TAO_FTEC_Group_Manager_Impl; class TAO_FTEC_Group_Manager : private TAO_FTEC_Fault_Listener @@ -72,4 +75,6 @@ protected: TAO_FTEC_Group_Manager_Impl* impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_FTEC_GROUP_MANAGER_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 884b769ffa0..2a80623f0df 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -11,6 +11,8 @@ ACE_RCSID (EventChannel, FTEC_ORBInitializer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void FTEC_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -33,8 +35,9 @@ FTEC_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_ptr ctmp; ACE_NEW_THROW_EX(ctmp, - TAO_Set_Update_Interceptor, - CORBA::NO_MEMORY()); + TAO_Set_Update_Interceptor, + CORBA::NO_MEMORY()); + ACE_CHECK; client_interceptor = ctmp; @@ -61,3 +64,5 @@ FTEC_ORBInitializer::post_init ( info->add_server_request_interceptor (server_interceptor.in() ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h index 947ea61cafa..07377cd40e1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class FTEC_ORBInitializer : public virtual PortableInterceptor::ORBInitializer , public virtual TAO_Local_RefCounted_Object @@ -34,5 +36,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* FTEC_ORBINITIALIZER__H_ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 90f14052e48..1fb4a4372bd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -9,6 +9,8 @@ ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const TAO_FTEC_ProxyPushConsumer::RollbackOperation TAO_FTEC_ProxyPushConsumer::rollback_obtain = &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer; @@ -128,3 +130,5 @@ void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyP ACE_ENV_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 15bba1e940e..252764ccda9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_ProxyPushConsumer : public TAO_EC_Default_ProxyPushConsumer { typedef TAO_EC_Default_ProxyPushConsumer Inherited; @@ -60,4 +62,6 @@ private: FtRtecEventChannelAdmin::ObjectId_var object_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index e400cc7e2eb..6c2b8e2adf9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -9,6 +9,8 @@ ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushSupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const TAO_FTEC_ProxyPushSupplier::RollbackOperation TAO_FTEC_ProxyPushSupplier::rollback_obtain = &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier; @@ -196,3 +198,5 @@ void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyP Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index a1ca15aeaff..7044d86f3bd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_ProxyPushSupplier : public TAO_EC_Default_ProxyPushSupplier { typedef TAO_EC_Default_ProxyPushSupplier Inherited; @@ -65,4 +67,6 @@ private: FtRtecEventChannelAdmin::ObjectId_var object_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index b67a0fe6a3a..e7bdb404bd0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -10,6 +10,7 @@ ACE_RCSID (EventChannel, TAO_FTEC_SupplierAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const FtRtecEventChannelAdmin::OperationType TAO_FTEC_SupplierAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_CONSUMER; @@ -45,7 +46,4 @@ TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr ACE_ENDTRY; } - - - - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index 9bbdca262ed..b1aed896d8b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -25,6 +25,8 @@ #include "orbsvcs/Event/EC_SupplierAdmin.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; namespace FtRtecEventChannelAdmin { @@ -71,5 +73,7 @@ public: void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_FTEC_SUPPLIERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index f833b81b70c..c055791b4ef 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -10,9 +10,11 @@ ACE_RCSID (EventChannel, FT_ProxyAdmin_Base, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + FT_ProxyAdmin_Base::FT_ProxyAdmin_Base(PortableServer::ServantBase* servant, PortableServer::POA_var poa) -: servant_(servant), poa_(poa) + : servant_(servant), poa_(poa) { } @@ -20,8 +22,9 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base() { } -void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid - ACE_ENV_ARG_DECL) +void +FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid + ACE_ENV_ARG_DECL) { poa_->activate_object_with_id( reinterpret_cast<const PortableServer::ObjectId&> (oid), @@ -32,17 +35,18 @@ void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid } -const FtRtecEventComm::ObjectId& FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +const FtRtecEventComm::ObjectId& +FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const { return object_id_; } -CORBA::Object_var FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const +CORBA::Object_var +FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const { - return poa_->servant_to_reference(servant_ - ACE_ENV_ARG_PARAMETER); + return poa_->servant_to_reference(servant_ + ACE_ENV_ARG_PARAMETER); } - - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 21bf1a7b9ca..2c639c0ce6f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -22,6 +22,7 @@ #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FT_ProxyAdmin_Base { @@ -46,7 +47,7 @@ protected: FtRtecEventComm::ObjectId object_id_; }; - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index 99d1749fa62..cd0fca06abd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -4,6 +4,8 @@ #include "Replication_Service.h" #include "ace/Synch_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class EC_PROXY_ADMIN, class Proxy, class ProxyInterface, class State> FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::FT_ProxyAdmin( @@ -139,3 +141,5 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state( ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index a0bff3fb0c8..59fe4d40261 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class EC_PROXY_ADMIN, class Proxy, class ProxyInterface, class State> class FT_ProxyAdmin : public FT_ProxyAdmin_Base @@ -31,8 +33,7 @@ public: FT_ProxyAdmin(EC_PROXY_ADMIN* admin, PortableServer::POA_var poa); - ProxyInterface_ptr - obtain_proxy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL); /// this is used for updating the state void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op @@ -44,6 +45,8 @@ private: EC_PROXY_ADMIN* admin_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "FT_ProxyAdmin_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index 1153b624382..33aff57f712 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -8,8 +8,10 @@ ACE_RCSID (EventChannel, Fault_Detector, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Fault_Detector::ReactorTask::ReactorTask() -: reactor_(new ACE_Select_Reactor, 1) + : reactor_(new ACE_Select_Reactor, 1) { } @@ -69,3 +71,5 @@ int Fault_Detector::parse_conf(int , char** ) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index 10d93e3705d..a10fdf62f8f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Fault_Listener; class Fault_Detector @@ -57,4 +59,6 @@ protected: TAO_FTEC_Fault_Listener* listener_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif //FAULT_DETECTOR_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 59af4a913d7..d4ac44c7f98 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -15,6 +15,8 @@ ACE_RCSID (EventChannel, Fault_Detector_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { typedef Fault_Detector_T< ACE_Acceptor<ConnectionAcceptHandler<ACE_SOCK_STREAM> , ACE_SOCK_ACCEPTOR>, @@ -67,9 +69,13 @@ namespace FTRTEC { { return detector_.get(); } +} + +TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// +namespace FTRTEC { ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader) ACE_STATIC_SVC_DEFINE (Fault_Detector_Loader, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h index 777cb73de7b..c1089b6e535 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h @@ -27,6 +27,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class Fault_Detector; @@ -46,8 +47,11 @@ namespace FTRTEC { private: auto_ptr<Fault_Detector> detector_; }; +} +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader) ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader) ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp index 8cb82fb3ca4..bcf68ca9e98 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -4,6 +4,8 @@ #include "ace/INET_Addr.h" #include "ace/os_include/os_netdb.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class ACCEPTOR, class CONNECTOR, class DETECTION_HANDLER> Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::Fault_Detector_T() { @@ -59,3 +61,5 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::connect(const FTRT::Lo return result ; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h index 6c9ed952bce..2d49e5be16c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -19,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class ACCEPTOR, class CONNECTOR, class DETECTION_HANDLER> class Fault_Detector_T : public Fault_Detector { @@ -33,6 +35,8 @@ private: virtual int init_acceptor(); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Fault_Detector_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h index a8bcb0bb35d..e66914b0c29 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h @@ -17,6 +17,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Fault_Listener { public: @@ -24,4 +28,6 @@ public: virtual void connection_closed()=0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 86671f2b39d..5223bf12706 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -17,6 +17,8 @@ ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) { @@ -254,3 +256,5 @@ void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerReques PortableInterceptor::ForwardRequest)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h index de0c52f7b14..d53dc682b0e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -19,8 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ForwardCtrlServerInterceptor : - public PortableInterceptor::ServerRequestInterceptor +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ForwardCtrlServerInterceptor + : public PortableInterceptor::ServerRequestInterceptor { public: ForwardCtrlServerInterceptor(); @@ -57,4 +59,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index ecac9882231..ee81eb94ce2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -11,6 +11,8 @@ ACE_RCSID (EventChannel, FtEventServiceInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool CachedRequestTable::is_new_request(const ACE_CString& client_id, CORBA::Long retention_id) { @@ -334,3 +336,5 @@ FtEventServiceInterceptor::set_state(const FtRtecEventChannelAdmin::CachedOption { request_table_.set_state(state); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index eb0e60fa1ea..09a28a81257 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; typedef FtRtecEventChannelAdmin::CachedResult CachedRequestInfo; @@ -93,6 +95,6 @@ private: CachedRequestTable request_table_; }; - +TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index a11b4ebe387..47f6ef5b05e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -14,9 +14,10 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL GroupInfoPublisherBase::GroupInfoPublisherBase() -: info_(new Info) + : info_(new Info) { info_->primary = false; } @@ -170,3 +171,5 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex> *ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index 1e010ee35df..8268bb2dd89 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Become_Primary_Listener; class GroupInfoPublisherBase @@ -75,4 +77,7 @@ private: }; typedef ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX> GroupInfoPublisher; + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index e5390fc7e05..159c3333b7b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -16,9 +16,10 @@ ACE_RCSID (EventChannel, IOGR_Maker, "$Id$") - static IOGR_Maker* maker; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + IOGR_Maker::IOGR_Maker() { } @@ -265,3 +266,4 @@ IOGR_Maker::set_tag_components( } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h index 29b0e512316..cbc933a61c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class IOGR_Maker { public: @@ -68,4 +70,6 @@ private: FT::TagFTGroupTaggedComponent ft_tag_component_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 9865ee48eed..8a7ad87eca7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -8,6 +8,8 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { namespace { @@ -79,7 +81,11 @@ namespace FTRTEC { { return name_; } +} +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace FTRTEC { ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service) ACE_STATIC_SVC_DEFINE (Identification_Service, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index 0fb06766859..518510a44fb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { class Identification_Service : public ACE_Service_Object @@ -44,7 +46,11 @@ namespace FTRTEC FtRtecEventComm::ObjectId object_id_; CosNaming::Name name_; }; +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service) ACE_STATIC_SVC_REQUIRE(Identification_Service) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 55b1640c5e9..0f9f2f1e0ae 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -1,6 +1,8 @@ // $Id$ #include "ObjectGroupManagerHandler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ObjectGroupManagerHandler::ObjectGroupManagerHandler( ACE_Auto_Event& evt, int num_backups) : evt_(evt), num_backups_(num_backups) @@ -65,3 +67,5 @@ ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder * ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 5e8bf7aaf88..8a3938a6c65 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -15,7 +15,10 @@ #include "orbsvcs/FTRT_GroupManagerS.h" #include "ace/Auto_Event.h" -class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ObjectGroupManagerHandler + : public POA_FTRT::AMI_ObjectGroupManagerHandler { public: ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups); @@ -53,4 +56,6 @@ private: ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index 5b2f764197e..6b325b03457 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -8,9 +8,11 @@ ACE_RCSID (EventChannel, ProxyConsumerStateWorker, "$Id$") -ProxyConsumerStateWorker::ProxyConsumerStateWorker - (FtRtecEventChannelAdmin::ProxyConsumerStates& states) -: consumerStates_(states) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +ProxyConsumerStateWorker::ProxyConsumerStateWorker ( + FtRtecEventChannelAdmin::ProxyConsumerStates& states) + : consumerStates_(states) { } @@ -25,9 +27,10 @@ void ProxyConsumerStateWorker::set_size(size_t size) } void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_FTEC_ProxyPushConsumer* proxy = static_cast<TAO_FTEC_ProxyPushConsumer*> (object); proxy->get_state(consumerStates_[index_++]); -} + +TAO_END_VERSIONED_NAMESPACE_DECL} diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h index 772fd16538e..bb0a317b06a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -21,7 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ProxyConsumerStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ProxyConsumerStateWorker + : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> { public: ProxyConsumerStateWorker(FtRtecEventChannelAdmin::ProxyConsumerStates& states); @@ -29,10 +32,12 @@ public: virtual void set_size(size_t size); virtual void work(TAO_EC_ProxyPushConsumer* object - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: int index_; FtRtecEventChannelAdmin::ProxyConsumerStates& consumerStates_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index 45b6c1f47d9..72fa8a0a8d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -9,10 +9,11 @@ ACE_RCSID (EventChannel, ProxySupplierStateWorker, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ProxySupplierStateWorker::ProxySupplierStateWorker - (FtRtecEventChannelAdmin::ProxySupplierStates& states) -: supplierStates_(states) +ProxySupplierStateWorker::ProxySupplierStateWorker ( + FtRtecEventChannelAdmin::ProxySupplierStates& states) + : supplierStates_(states) { } @@ -33,3 +34,5 @@ void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object static_cast<TAO_FTEC_ProxyPushSupplier*> (object); proxy->get_state(supplierStates_[index_++]); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h index aa6681719de..f8ff8d7a686 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -21,7 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ProxySupplierStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ProxySupplierStateWorker + : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> { public: ProxySupplierStateWorker(FtRtecEventChannelAdmin::ProxySupplierStates& states); @@ -35,4 +38,6 @@ private: FtRtecEventChannelAdmin::ProxySupplierStates& supplierStates_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index fd0f6484c9a..fe995935502 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -17,6 +17,7 @@ ACE_RCSID (EventChannel, Replication_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { @@ -190,7 +191,12 @@ namespace FTRTEC int Replication_Service::threads() const { return FTRTEC::threads; } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC +{ ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service) ACE_STATIC_SVC_DEFINE (Replication_Service, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index f01503ef6ae..4d9f09e3082 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { class TAO_FTRTEC_Export Replication_Service @@ -72,8 +74,12 @@ namespace FTRTEC int threads() const; }; +} +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC +{ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service) ACE_STATIC_SVC_REQUIRE(Replication_Service) ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index 0501abb2557..11064ad2154 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -8,6 +8,8 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Replication_Strategy::Replication_Strategy() { } @@ -29,3 +31,5 @@ Replication_Strategy::make_primary_strategy() { return this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index 3e44f33ff41..8c661ee0ee8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -19,6 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTEC { struct ManagerInfo; @@ -61,7 +62,7 @@ public: CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL)=0; - virtual Replication_Strategy* make_primary_strategy(); + virtual Replication_Strategy* make_primary_strategy(); virtual int acquire_read (void)=0; virtual int acquire_write (void)=0; @@ -69,5 +70,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index e9c77862e25..882ed76ea19 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -24,6 +24,7 @@ CORBA::ORB_ptr orb; ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid; } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info @@ -311,3 +312,5 @@ Request_Context_Repository::get_transaction_depth( return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 7267d1346f7..542f58937ea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -1,4 +1,4 @@ -// -pe*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; namespace PortableInterceptor @@ -109,4 +111,6 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /// REQUEST_CONTEXT_REPOSITORY_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp index a54588c9423..12d07ff4475 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp @@ -20,6 +20,7 @@ ACE_RCSID (EventChannel, #define SOL_SCTP 132 #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL SCTP_Connector::SCTP_Connector() : heart_beat_(0) @@ -90,4 +91,6 @@ int SCTP_Fault_Detector::parse_conf(int argc, char** argv) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_HAS_SCTP == 1 */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h index 9411df45f4c..7be6c844a88 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h @@ -45,6 +45,7 @@ extern "C" { #define SCTP_NODELAY 1 #endif // SCTP_NODELAY +TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Acceptor<ConnectionAcceptHandler<ACE_SOCK_SEQPACK_ASSOCIATION>, ACE_SOCK_SEQPACK_ACCEPTOR> SCTP_ConnectionAcceptHandler; @@ -78,6 +79,8 @@ private: virtual int parse_conf(int argc, char** argv); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_SCIOP */ #endif /* SCTP_FAULT_DETECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index f94e75c0152..24e9ab694f8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -9,8 +9,9 @@ ACE_RCSID (EventChannel, Set_Update_Intercetpor, "$Id$") -TAO_Set_Update_Interceptor:: -TAO_Set_Update_Interceptor () +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor () : myname_ ("TAO_Set_Update_Interceptor") { } @@ -140,28 +141,28 @@ TAO_Set_Update_Interceptor::send_request ( void TAO_Set_Update_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri + PortableInterceptor::ClientRequestInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG(ri); } void TAO_Set_Update_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) + PortableInterceptor::ClientRequestInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableInterceptor::ForwardRequest)) { } void TAO_Set_Update_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) + PortableInterceptor::ForwardRequest)) { - ACE_UNUSED_ARG(ri); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index 835ecab637c..c164c238281 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -27,6 +27,8 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Set_Update_Interceptor * @@ -79,4 +81,6 @@ private: const char *myname_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_SET_UPDATE_INTERCEPTOR_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp index 033b41ec2b5..206abdc8168 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp @@ -6,17 +6,18 @@ ACE_RCSID (EventChannel, Update_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL Update_Manager::Update_Manager(ACE_Auto_Event& evt, int num_backups, int transaction_depth, bool& success) -: evt_(evt) -, replied_(num_backups) -, suicide_condition_(num_backups) -, num_backups_(num_backups) -, transaction_level_(transaction_depth) -, success_(success) + : evt_(evt) + , replied_(num_backups) + , suicide_condition_(num_backups) + , num_backups_(num_backups) + , transaction_level_(transaction_depth) + , success_(success) { suicide_condition_.flip(); signal_condition_.resize(transaction_depth, true); @@ -56,3 +57,5 @@ void Update_Manager::handle_exception(int id) if (replied_ == suicide_condition_) delete this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h index fa64b9e9f10..aa5cf422867 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h @@ -20,8 +20,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -typedef Dynamic_Bitset bit_vector; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +typedef Dynamic_Bitset bit_vector; class Update_Manager { @@ -46,4 +47,6 @@ private: ACE_SYNCH_MUTEX mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index d9bd9a8ade9..3e01eda861f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -10,8 +10,10 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy) -: strategy_(strategy) + : strategy_(strategy) { } @@ -94,3 +96,5 @@ void UpdateableHandler::set_update_excep ( dispatch(&Update_Manager::handle_exception ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 1f684edaee9..48f621bc1ef 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class AMI_Primary_Replication_Strategy; class Update_Manager; @@ -52,4 +54,7 @@ public: private: AMI_Primary_Replication_Strategy* strategy_; }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp index da10c2f1a7f..21452bb75ec 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp @@ -6,6 +6,8 @@ ACE_RCSID (EventChannel, create_persistent_poa, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::POAManager_var mgr, const char* name, @@ -43,3 +45,5 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h index 875ac649b29..cd41683ea61 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h @@ -17,9 +17,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::POAManager_var mgr, const char* name, CORBA::PolicyList& policy_list ACE_ENV_ARG_DECL); + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp index d190e31c099..8b902ac91bc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp @@ -13,10 +13,11 @@ ACE_RCSID (EventChannel, /// file conflicts with the use of auto_ptr in the /// VxWorks5.5.1_PPC85XX_DIAB platform. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void replace_key(char* ior, char* end_ior, - const TAO::ObjectKey& oldkey, - const TAO::ObjectKey& newkey) + const TAO::ObjectKey& oldkey, + const TAO::ObjectKey& newkey) { size_t keylen = oldkey.length(); ACE_ASSERT(keylen == newkey.length()); @@ -30,3 +31,5 @@ void replace_key(char* ior, char* end_ior, pos+= keylen; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 45f9356b385..3de9bcaee9f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -13,6 +13,7 @@ ACE_RCSID (Utils, #include "FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { class FTEC_Gateway_ConsumerAdmin @@ -511,8 +512,12 @@ void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder * ACE_ENV_ARG_DECL_NOT_USED) +void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder * + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } -} + +} // TAO_FTRTEC + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 9cafa79f8f8..af72ff4118e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file FTEC_Gateway.h @@ -16,6 +17,8 @@ #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "orbsvcs/RtecEventChannelAdminS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { struct FTEC_Gateway_Impl; @@ -69,6 +72,8 @@ namespace TAO_FTRTEC }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl index e8175e14573..4a4869aece4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL) @@ -8,3 +12,5 @@ namespace TAO_FTRTEC { return activate(poa.in() ACE_ENV_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index a5e7970c995..c691b427009 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -5,6 +5,8 @@ #include "Log.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { unsigned int Log::log_level_; @@ -23,3 +25,5 @@ unsigned int Log::log_level_; } #endif } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 5ca4cfade59..2897fdc083c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file Log.h @@ -13,9 +14,12 @@ #include /**/ "ace/pre.h" #include "ftrtevent_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/OS.h" #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { /** @@ -34,6 +38,8 @@ namespace TAO_FTRTEC { }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "Log.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl index b35e1a5a432..120a88f6557 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { #ifndef NDEBUG ACE_INLINE @@ -43,3 +47,5 @@ namespace TAO_FTRTEC { } #endif } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h index ec59ca1b758..e2c7ade549a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h @@ -15,6 +15,8 @@ #include "ftrtevent_export.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FtRtEvent_Export Safe_InputCDR : public TAO_InputCDR { public: @@ -28,6 +30,8 @@ public: Safe_InputCDR(const char* buf, int size); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "Safe_InputCDR.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl index a83166e8987..a4712c153f5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl @@ -1,6 +1,11 @@ +// -*- C++ -*- +// // $Id$ + #include "ace/OS_Memory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE Safe_InputCDR::Safe_InputCDR(const char* buf, int size) : TAO_InputCDR((ACE_Message_Block*)0) @@ -14,3 +19,5 @@ Safe_InputCDR::Safe_InputCDR(const char* buf, int size) this->start_.wr_ptr(size); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h index 47a187bc3b4..1b0dc0bc02d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h @@ -13,6 +13,8 @@ #ifndef SCOPEGUARD_H_ #define SCOPEGUARD_H_ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class T> class RefHolder { @@ -286,6 +288,8 @@ inline ObjScopeGuardImpl2<Obj, MemFun, P1, P2> MakeObjGuard(Obj& obj, MemFun mem return ObjScopeGuardImpl2<Obj, MemFun, P1, P2>::MakeObjGuard(obj, memFun, p1, p2); } +TAO_END_VERSIONED_NAMESPACE_DECL + #define CONCATENATE_DIRECT(s1, s2) s1##s2 #define CONCATENATE(s1, s2) CONCATENATE_DIRECT(s1, s2) #define ANONYMOUS_VARIABLE(str) CONCATENATE(str, __LINE__) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 217f701283e..c97e70b407e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Utils, #include "UUID.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static union { struct @@ -161,3 +163,5 @@ UUID::create (unsigned char *buffer) memcpy(buffer + 10, &node, 6); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h index ffdef9e1738..0d7af19d246 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h @@ -13,6 +13,7 @@ #include /**/ "ace/pre.h" #include "ftrtevent_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/OS.h" #include "ace/SString.h" @@ -28,6 +29,8 @@ #define TAO_EXPORT_NESTED_MACRO FtRtEvent_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * This is an implementation of Global Unique Identifier * which follows the document draft-leach-uuids-guids-01.txt. The @@ -110,6 +113,8 @@ class TAO_FtRtEvent_Export UUID } rep_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "UUID.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl index 3093cf873dd..e1238a12ff1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE UUID::UUID() { @@ -50,3 +54,5 @@ void UUID::to_string(ACE_CString& string) const string.resize(STRING_LENGTH-1); this->to_string(&string[0]); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index be09a2870a5..9913cc8c8c9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -11,24 +11,33 @@ #ifndef ACTIVATE_WITH_ID_H #define ACTIVATE_WITH_ID_H +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> void activate_object_with_id (T * &result, PortableServer::POA_ptr poa, PortableServer::ServantBase *servant, const FtRtecEventComm::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&> (oid); + const PortableServer::ObjectId& id = + reinterpret_cast<const PortableServer::ObjectId&> (oid); poa->activate_object_with_id(id, - servant ACE_ENV_ARG_PARAMETER); - + servant + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var object = poa-> - id_to_reference(id ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = + poa->id_to_reference(id + ACE_ENV_ARG_PARAMETER); ACE_CHECK; result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h index 0cefc3da7e9..c489912d527 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h @@ -11,6 +11,10 @@ #ifndef RESOVLE_INIT_H #define RESOVLE_INIT_H +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> typename T::_ptr_type resolve_init (CORBA::ORB_ptr orb, @@ -63,4 +67,7 @@ resolve (CosNaming::NamingContext_ptr context, return ref._retn(); } #endif + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index ef818176259..a9a5b5e0022 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -23,6 +23,8 @@ ACE_RCSID(HTIOP, TAO_HTIOP_Acceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env, int is_inside) : TAO_Acceptor (OCI_TAG_HTIOP_PROFILE), @@ -881,3 +883,5 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) } return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index bff5b395142..53f6374b6e2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -42,6 +42,8 @@ namespace ACE } } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace HTIOP @@ -225,6 +227,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "HTIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i index d843a900f46..6b3279c0c04 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const ACE::HTBP::Addr& TAO::HTIOP::Acceptor::address (void) const { @@ -21,3 +24,5 @@ TAO::HTIOP::Acceptor::endpoints (void) return this->addrs_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp index dbc2c7afb7c..a971a420324 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // $Id$ #ifndef HTIOP_ACCEPTOR_IMPL_CPP @@ -23,9 +22,7 @@ #include "ace/Object_Manager.h" -ACE_RCSID(HTIOP, - TAO_HTIOP_Acceptor_Impl, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////////////////////////////////////////////////////////// @@ -320,4 +317,6 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handle return this->creation_strategy_->make_svc_handler (sh); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* HTIOP_ACCEPTOR_IMPL_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index 842d65a7e0d..f90dc2fda34 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,8 @@ #include "tao/corbafwd.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class TAO_ORB_Core; @@ -140,6 +142,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "HTIOP_Acceptor_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index 81e2b1b6d16..f50d5fb2ff7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -21,6 +21,8 @@ ACE_RCSID (HTIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t) : COMPLETION_BASE(t,0,0), orb_core_ (0), @@ -175,3 +177,5 @@ TAO::HTIOP::Completion_Handler::handle_close (ACE_HANDLE, delete this; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index 4fce97d6a85..31cbf4c043f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- // =================================================================== /** @@ -27,6 +27,8 @@ #include "HTIOP_Export.h" #include "HTIOP_Connection_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; // **************************************************************** @@ -91,5 +93,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* HTIOP_COMPLETION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 485bb25d89d..8962633cda2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -25,6 +25,9 @@ ACE_RCSID (HTIOP, TAO_HTIOP_Connection_Handler, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t) : SVC_HANDLER (t,0,0), TAO_Connection_Handler (0) @@ -277,7 +280,10 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list } int -TAO::HTIOP::Connection_Handler::set_dscp_codepoint (CORBA::Boolean /*enable_network_priority*/) +TAO::HTIOP::Connection_Handler::set_dscp_codepoint ( + CORBA::Boolean /*enable_network_priority*/) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 76ca95eb810..7c889f6a1dd 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- // =================================================================== /** @@ -29,6 +29,7 @@ #include "ace/Reactor.h" #include "ace/Svc_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward Decls class TAO_Pluggable_Messaging; @@ -127,5 +128,8 @@ namespace TAO }; } } + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* HTIOP_CONNECTION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index efec14803e4..d0acebb16c9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -23,6 +23,8 @@ ACE_RCSID (HTIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env) : TAO_Connector (OCI_TAG_HTIOP_PROFILE), connect_creation_strategy_ (), @@ -414,3 +416,5 @@ TAO::HTIOP::Connector::remote_endpoint (TAO_Endpoint *endpoint) return htiop_endpoint; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index 97e94cab63e..9248e779818 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -43,6 +43,8 @@ namespace ACE // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace HTIOP @@ -127,5 +129,8 @@ namespace TAO }; } } + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* HTIOP_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index 8cf576af02b..ef4bc8612cd 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -5,9 +5,7 @@ #include "HTIOP_Connector_Impl.h" -ACE_RCSID(HTIOP, - TAO_HTIOP_Connector_Impl, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class SVC_HANDLER> TAO::HTIOP::Connect_Creation_Strategy<SVC_HANDLER>:: @@ -59,5 +57,6 @@ activate_svc_handler (SVC_HANDLER *sh, arg); } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* HTIOP_CONNECTOR_IMPL_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 39d8aa62734..64f457f18b2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -1,5 +1,5 @@ - // -*- C++ -*- + // =================================================================== /** * @file HTIOP_Connector_Impl.h @@ -23,9 +23,12 @@ #include "tao/corbafwd.h" #include "ace/Strategies_T.h" -class TAO_ORB_Core; class ACE_Thread_Manager; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_ORB_Core; + namespace TAO { namespace HTIOP @@ -109,6 +112,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "HTIOP_Connector_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index 48b08e11eae..488a3a746d5 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -17,6 +17,8 @@ ACE_RCSID (HTIOP, # include "HTIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::HTIOP::Endpoint::Endpoint (const ACE::HTBP::Addr &addr, int use_dotted_decimal_addresses) : TAO_Endpoint (OCI_TAG_HTIOP_PROFILE), @@ -218,3 +220,5 @@ TAO::HTIOP::Endpoint::hash (void) return ACE::hash_pjw(this->htid_.in()); return this->object_addr ().get_ip_address () + this->port (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index 435328da5c5..aee4075cff9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -1,5 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- - +// -*- C++ -*- //============================================================================= /** @@ -9,7 +8,6 @@ * * HTIOP implementation of PP Framework Endpoint interface. * - * * @author Marina Spivak <marina@cs.wustl.edu> */ //============================================================================= @@ -30,6 +28,8 @@ #include "tao/Endpoint.h" #include "tao/ORB.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace HTIOP @@ -152,6 +152,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "HTIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i index b7de055271c..dffd4f6705b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const ACE::HTBP::Addr & TAO::HTIOP::Endpoint::object_addr (void) const { @@ -72,3 +75,5 @@ TAO::HTIOP::Endpoint::port (CORBA::UShort p) { return this->port_ = p; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 0f8f70bbe0a..ba5804310ae 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -12,7 +12,9 @@ ACE_RCSID (HTIOP, TAOHTIOP_Factory, "$Id$") - static const char prefix_[] = "htiop"; +static const char the_prefix[] = "htiop"; + +TAO_END_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Protocol_Factory::Protocol_Factory (void) : TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE), @@ -32,13 +34,13 @@ int TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); } const char * TAO::HTIOP::Protocol_Factory::prefix (void) const { - return ::prefix_; + return ::the_prefix; } char @@ -123,6 +125,8 @@ TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_HTIOP_Protocol_Factory, ACE_TEXT ("HTIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 746b8a83707..4d824cb7cf2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -32,6 +32,8 @@ namespace ACE } } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace HTIOP @@ -81,6 +83,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + // Note that these declarations are placed outside of the scope of the // namespace. The generated functions use a C style signature which does // not accomodate namespaces, so assuming namespace concatination is an diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 6cc0c041d50..83c81890696 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -16,7 +16,9 @@ ACE_RCSID(HTIOP, TAO_HTIOP_Profile, "$Id$") -static const char prefix_[] = "htiop"; +static const char the_prefix[] = "htiop"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO::HTIOP::Profile::object_key_delimiter_ = '/'; @@ -291,7 +293,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) size_t buflen = (8 /* "corbaloc" */ + 1 /* colon separator */ + - ACE_OS::strlen (::prefix_) + + ACE_OS::strlen (::the_prefix) + 1 /* colon separator */ + 1 /* major version */ + 1 /* decimal point */ + @@ -309,7 +311,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@%s:%d%c%s", - ::prefix_, + ::the_prefix, digits [this->version_.major], digits [this->version_.minor], this->endpoint_.host (), @@ -325,7 +327,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO::HTIOP::Profile::prefix (void) { - return ::prefix_; + return ::the_prefix; } void @@ -467,3 +469,5 @@ TAO::HTIOP::Profile::decode_endpoints (void) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index e8556b345d2..6405145adfa 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -32,6 +32,8 @@ # define OCI_TAG_HTIOP_PROFILE 0x4f434902U #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace HTIOP @@ -143,5 +145,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* HTIOP_PROFILE_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index bc6475d58bb..47bdf0bcf06 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -26,6 +26,8 @@ ACE_RCSID (HTIOP, TAO_HTIOP_Transport, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -450,3 +452,5 @@ TAO::HTIOP::Transport::invalidate_event_handler_i (void) this->connection_handler_ = 0; return eh; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 209622ac41a..c17aefcfad8 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -1,6 +1,5 @@ - -// This may look like C, but it's really -*- C++ -*- // -*- C++ -*- + // =================================================================== /** * @file HTIOP_Transport.h @@ -32,6 +31,14 @@ #include "ace/Svc_Handler.h" //#include "HTIOP/HTIOPC.h" +# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) +# define ACE_HTBP_STREAM ACE::HTBP::Stream +# else /* If TEMPLATES are broken in some form or another */ +# define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr +#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward decls. class TAO_ORB_Core; class TAO_Operation_Details; @@ -39,12 +46,6 @@ class TAO_Pluggable_Messaging; class TAO_Acceptor; class TAO_Adapter; -# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -# define ACE_HTBP_STREAM ACE::HTBP::Stream -# else /* If TEMPLATES are broken in some form or another */ -# define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - namespace TAO { namespace HTIOP @@ -161,5 +162,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp index 5bb8026bb9f..6a4f8475997 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -264,3 +266,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h index 095a5e35674..03f874b5f53 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h @@ -62,6 +62,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -180,6 +182,8 @@ HTIOP_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_H_ */ +TAO_END_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index 32aa79e1770..791e3b79954 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "AbstractInterfaceDef_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, AbstractInterfaceDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i ( TAO_Repository_i *repo ) @@ -57,3 +58,5 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id return this->TAO_InterfaceDef_i::is_a_i (interface_id ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h index 7a5ca4c9e44..ce2ab4dcbdb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_AbstractInterfaceDef_i : public virtual TAO_InterfaceDef_i { @@ -67,6 +70,8 @@ public: 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/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 1bcc20308ff..1c4e8b5d987 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -11,6 +11,7 @@ ACE_RCSID (IFRService, AliasDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -136,3 +137,5 @@ TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def "original_type", original_type); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index 621ecf462de..c8e0f2fffb4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_AliasDef_i : public virtual TAO_TypedefDef_i { public: @@ -89,6 +92,8 @@ public: 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/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index d3a5a59a641..1c0a53c240d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -11,6 +11,7 @@ ACE_RCSID (IFRService, ArrayDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -274,3 +275,5 @@ TAO_ArrayDef_i::destroy_element_type ( break; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index e0f4acf028f..ee024d06a9f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ArrayDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -136,6 +139,8 @@ private: // Destroys an anonymous non-primitive element type. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index c8322e6823b..1027d8f5928 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -13,6 +13,7 @@ ACE_RCSID (IFRService, AttributeDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AttributeDef_i::TAO_AttributeDef_i ( TAO_Repository_i *repo @@ -392,3 +393,5 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index 86cd2f55589..2c3883e7906 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_AttributeDef_i : public virtual TAO_Contained_i { // = TITLE @@ -140,10 +143,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_ATTRIBUTEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index 374a2ee2f02..918723c6417 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "ComponentContainer_i.h" @@ -12,6 +11,8 @@ ACE_RCSID (IFRService, ComponentContainer_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_ComponentContainer_i::tmp_name_holder_ = 0; @@ -563,3 +564,5 @@ TAO_ComponentContainer_i::same_as_tmp_name (const char *name) return ACE_OS::strcmp (TAO_ComponentContainer_i::tmp_name_holder_, name) == 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index e72459b8a84..f656d9ea391 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ComponentContainer_i : public virtual TAO_Container_i { @@ -131,6 +134,9 @@ protected: static const char *tmp_name_holder_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index b6a6810f039..2ba6e45a7fa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -17,6 +17,7 @@ ACE_RCSID (IFRService, ComponentDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Specialization. template<> @@ -789,3 +790,5 @@ TAO_ComponentDef_i::name_clash (const char *name) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 772128114d5..4db2f4b69dc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -35,6 +36,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ComponentDef_i : public virtual TAO_ExtInterfaceDef_i { @@ -234,6 +237,8 @@ public: // are a base component. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 16a5f34a9a7..6a0a56173b4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "ComponentModuleDef_i.h" @@ -7,6 +6,9 @@ ACE_RCSID (IFRService, ComponentModuleDef_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), @@ -17,3 +19,5 @@ TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h index cd04c6ee327..ba0d9850e22 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ComponentModuleDef_i : public virtual TAO_ComponentContainer_i { @@ -50,6 +53,8 @@ public: // Destructor }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index f2e1f1dee39..8fafb46de7e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -18,6 +18,9 @@ ACE_RCSID (IFRService, ComponentRepository_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ComponentRepository_i::TAO_ComponentRepository_i ( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -239,4 +242,4 @@ TAO_ComponentRepository_i::select_poa ( } } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index a59740f7284..d6c2a404395 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -29,6 +30,9 @@ #include "ComponentContainer_i.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ModuleDef_i; class TAO_ComponentDef_i; class TAO_HomeDef_i; @@ -116,6 +120,8 @@ protected: // Servants for each IR Object type, created at startup. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 4ef6a3dd900..3e5a832a1f4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -16,6 +16,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ConstantDef_i::TAO_ConstantDef_i ( TAO_Repository_i *repo ) @@ -307,3 +309,5 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value mb->base (), mb->length ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index 05ef7b30c2f..a3b0b2b29fa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ConstantDef_i : public virtual TAO_Contained_i { // = TITLE @@ -120,6 +123,8 @@ public: 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/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index e730f4203cc..e7a77458e5a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ #include "Repository_i.h" @@ -8,6 +9,8 @@ ACE_RCSID (IFRService, ConsumesDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ConsumesDef_i::TAO_ConsumesDef_i ( TAO_Repository_i *repo ) @@ -28,3 +31,4 @@ TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Consumes; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 4cb2a0bbe0d..231ed6f2f84 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ConsumesDef_i : public virtual TAO_EventPortDef_i { @@ -56,6 +59,8 @@ public: // Return our definition kind. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 2204768af19..4ca4a05623a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -12,6 +12,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const char *TAO_Contained_i::tmp_name_holder_ = 0; TAO_Contained_i::TAO_Contained_i ( @@ -1253,3 +1255,5 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index 3ed5648427a..ddc84da8c21 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_Contained_i : public virtual TAO_IRObject_i { // = TITLE @@ -223,6 +226,9 @@ private: static const char *tmp_name_holder_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index 08ca7ab5bc3..6f3953afc5d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -19,6 +19,7 @@ ACE_RCSID (IFRService, Container_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_Container_i::tmp_name_holder_ = 0; @@ -2679,3 +2680,5 @@ TAO_Container_i::create_value_common ( return path; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index a5c85dfb59a..54fffd17de3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Repository_i; class TAO_IFRService_Export TAO_Container_i : public virtual TAO_IRObject_i @@ -467,6 +470,8 @@ protected: static const char *tmp_name_holder_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 66b5c985cd6..2232fcd228d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "EmitsDef_i.h" @@ -8,6 +7,9 @@ ACE_RCSID (IFRService, EmitsDef_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -26,3 +28,5 @@ TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Emits; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index 184415fc1ae..1537eb6b433 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_EmitsDef_i : public virtual TAO_EventPortDef_i { @@ -56,6 +59,8 @@ public: // Return our definition kind. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index a97939c8184..e3ff2992e2c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -11,6 +11,7 @@ ACE_RCSID (IFRService, EnumDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -158,3 +159,5 @@ TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members member_name); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index 5842bc5ebef..ce90039c409 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_EnumDef_i : public virtual TAO_TypedefDef_i { public: @@ -89,6 +92,8 @@ public: 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/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index 2a697660c7f..c0311732717 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "Repository_i.h" @@ -8,6 +7,9 @@ ACE_RCSID (IFRService, EventDef_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), @@ -96,3 +98,4 @@ TAO_EventDef_i::is_a_i (const char *event_id ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index dcd60a7ac1e..95210c872d9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_EventDef_i : public virtual TAO_ExtValueDef_i { // = TITLE @@ -90,11 +93,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EVENTDEF_I_H */ - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index b81e87ba6d8..1a6c2edc224 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -12,6 +12,7 @@ ACE_RCSID (IFRService, EventPortDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -194,3 +195,5 @@ TAO_EventPortDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return CORBA::dk_none; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index 2ca1f2b0ce5..93e7ff394c3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_EventPortDef_i : public virtual TAO_Contained_i { @@ -109,6 +112,8 @@ private: // in this 'abstract' base class. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 1c6fa2b4fd7..53e2849200a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -11,6 +11,7 @@ ACE_RCSID (IFRService, ExceptionDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExceptionDef_i::TAO_ExceptionDef_i ( TAO_Repository_i *repo @@ -346,3 +347,5 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members count); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index bf00881ff37..ca6864b1612 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -33,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i, public virtual TAO_Container_i { @@ -112,6 +115,8 @@ public: 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/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 16b2c30b1b9..18e2d85ca02 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "ExtAbstractInterfaceDef_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, ExtAbstractInterfaceDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i ( TAO_Repository_i *repo ) @@ -39,3 +40,4 @@ TAO_ExtAbstractInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) TAO_AbstractInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index 12e4ec7f016..467a1509877 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i : public virtual TAO_AbstractInterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i @@ -57,10 +61,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTABSTRACTINTERFACEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index 020ae781324..a3de999bf4f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -13,6 +13,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -309,3 +311,5 @@ TAO_ExtAttributeDef_i::exceptions (const char *sub_section, path); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index 687a5c90e35..83f1f6e3b98 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ExtAttributeDef_i : public virtual TAO_AttributeDef_i { @@ -121,9 +124,10 @@ private: const CORBA::ExcDescriptionSeq &exceptions); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTATTRIBUTEDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index 8bac0da9e13..f104cf7ff60 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "ExtInterfaceDef_i.h" @@ -8,6 +7,9 @@ ACE_RCSID (IFRService, ExtInterfaceDef_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i ( TAO_Repository_i *repo ) @@ -24,3 +26,4 @@ TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h index e28f2377505..43d33ffc3a3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ExtInterfaceDef_i : public virtual TAO_InterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i @@ -52,9 +56,10 @@ public: // Destructor }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTINTERFACEDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index ea0ea0e3c41..d542a8d858f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "ExtLocalInterfaceDef_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, ExtLocalInterfaceDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i ( TAO_Repository_i *repo ) @@ -39,3 +40,4 @@ TAO_ExtLocalInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) TAO_LocalInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index 69ce82a4b8c..d1c0c19e632 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ExtLocalInterfaceDef_i : public virtual TAO_LocalInterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i @@ -57,6 +60,8 @@ public: 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/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index 25da09c1ec8..e108597159d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -13,6 +13,7 @@ ACE_RCSID (IFRService, ExtValueDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -970,3 +971,5 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key, type_path); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index 28be501b651..802212bf0ab 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ExtValueDef_i : public virtual TAO_ValueDef_i { // = TITLE @@ -123,10 +126,10 @@ private: const CORBA::ExceptionDefSeq &exceptions); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTVALUEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index 111e0c74c85..0664f117126 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "Repository_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, FactoryDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FactoryDef_i::TAO_FactoryDef_i ( TAO_Repository_i *repo ) @@ -28,3 +29,4 @@ TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Factory; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index b43598a81d5..2e788c6a4f2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_FactoryDef_i : public virtual TAO_OperationDef_i { // = TITLE @@ -54,12 +57,10 @@ public: // Return our definition kind. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_FACTORYDEF_I_H */ - - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index ce796fdf494..0d7e9b5983b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "Repository_i.h" @@ -8,6 +7,9 @@ ACE_RCSID (IFRService, FinderDef_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -26,3 +28,4 @@ TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Finder; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index c3b5f9364f1..aec902a1516 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_FinderDef_i : public virtual TAO_OperationDef_i { // = TITLE @@ -54,12 +58,10 @@ public: // Return our definition kind. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_FINDERDEF_I_H */ - - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index f25e95d10ca..56befc089a9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "Repository_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, FixedDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_IDLType_i (repo) @@ -148,3 +149,4 @@ TAO_FixedDef_i::scale_i (CORBA::Short /* scale */ // TODO } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index 6a9b432ba6b..6141f1262b3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_FixedDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -121,9 +124,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_FIXEDDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index d427ebe6dc2..1906d73c208 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -17,6 +17,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), @@ -1051,3 +1053,5 @@ TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key, ead.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index 81489528a24..e18572359da 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_HomeDef_i : public virtual TAO_ExtInterfaceDef_i { @@ -273,12 +277,10 @@ private: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_HOMEDEF_I_H */ - - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 7a011af0830..46f57289ab4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "IDLType_i.h" @@ -7,6 +6,9 @@ ACE_RCSID (IFRService, IDLType_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo) { @@ -16,3 +18,4 @@ TAO_IDLType_i::~TAO_IDLType_i (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index 1d50ed0348c..810d87dc757 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // $Id$ // ============================================================================ @@ -32,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Repository_i; class TAO_IFRService_Export TAO_IDLType_i : public virtual TAO_IRObject_i @@ -64,9 +66,10 @@ public: // Defined in concrete classes. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_IDLTYPE_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 0e861af9cd7..40d09f52ae5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -18,6 +18,8 @@ ACE_RCSID (IFR_Service, IFR_Service_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void) { // Constructor @@ -93,4 +95,6 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_IFRService, TAO_IFR_Service_Loader) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index 2fc8122c23d..751ba68c8ed 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -27,6 +27,8 @@ #include "IFR_Service_Utils.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader { public: @@ -60,11 +62,15 @@ protected: private: + // Disallowing copying/assignment. TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &); - TAO_IFR_Service_Loader &operator = (const TAO_IFR_Service_Loader &); + TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_IFRService, TAO_IFR_Service_Loader) #endif /* TAO_IFR_SERVICE_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 3b9b184b3cf..1fd77110dec 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -21,6 +21,8 @@ ACE_RCSID (IFR_Service, IFR_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; TAO_IFR_Server::TAO_IFR_Server (void) @@ -1433,3 +1435,4 @@ TAO_IFR_Service_Utils::oid_to_string (PortableServer::ObjectId &oid) return oid_string; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index 8978bc212bf..ed2dcdc6397 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -31,9 +32,11 @@ #include "ace/Configuration.h" -// Forward decl; -class TAO_IOR_Multicast; class ACE_Configuration; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_IOR_Multicast; class TAO_Repository_i; class TAO_IDLType_i; class TAO_Container_i; @@ -246,6 +249,8 @@ public: static TAO_Repository_i *repo_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IFR_SERVICE_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index 02e14e8859e..27d12bb7c06 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -9,7 +9,7 @@ #include "ace/SString.h" - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> void @@ -276,17 +276,13 @@ TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_descriptions ( template<typename T_desc_seq> void TAO_Port_Desc_Seq_Utils<T_desc_seq>::get_is_multiple ( - T_desc_seq &desc_seq, - ACE_Configuration *config, - ACE_Configuration_Section_Key &key, - CORBA::ULong index + T_desc_seq & /* desc_seq */, + ACE_Configuration * /* config */, + ACE_Configuration_Section_Key & /* key */, + CORBA::ULong /* index */ ) { // All types except UsesDescription have no is_multiple member. - ACE_UNUSED_ARG (desc_seq); - ACE_UNUSED_ARG (config); - ACE_UNUSED_ARG (key); - ACE_UNUSED_ARG (index); } template<typename T_desc_seq> @@ -363,14 +359,13 @@ TAO_Port_Utils<T>::create_entry (const char *id, template<typename T> void -TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple, - ACE_Configuration *config, - ACE_Configuration_Section_Key &key) +TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */, + ACE_Configuration * /* config */, + ACE_Configuration_Section_Key & /* key */) { - /// Do nothing for eveything except UsesDef. - ACE_UNUSED_ARG (is_multiple); - ACE_UNUSED_ARG (config); - ACE_UNUSED_ARG (key); + // Do nothing for everything except UsesDef. } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_IFR_SERVICE_UTILS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 52159d58543..2f0df4be017 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -31,6 +31,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Repository_i; template<typename T> @@ -108,6 +110,8 @@ public: ACE_Configuration_Section_Key &key); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "IFR_Service_Utils_T.cpp" #endif /* defined REQUIRED SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 5fd3d758894..57c6d85cfd3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -16,6 +16,8 @@ ACE_RCSID (IFR_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo) : repo_ (repo) { @@ -83,3 +85,5 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index 65908ea60ff..30733d02dfb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Repository_i; class TAO_IDLType_i; class TAO_Contained_i; @@ -87,6 +90,8 @@ protected: // Our ACE_Configuration section key. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index e8725ba91a0..2d803d0eba9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -15,10 +15,10 @@ ACE_RCSID (IFRService, InterfaceAttrExtension_i, "$Id$") - - // ===================================================================== +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i ( TAO_Repository_i *repo ) @@ -317,3 +317,5 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i ( return retval._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h index 37694831b1b..e2f231af0e7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // $Id$ // ============================================================================ @@ -32,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_InterfaceAttrExtension_i : public virtual TAO_IRObject_i { @@ -86,9 +88,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_INTERFACEATTREXTENSION_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index a1ecd8af581..b32d6e674ff 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -14,6 +14,7 @@ ACE_RCSID (IFRService, InterfaceDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_InterfaceDef_i::TAO_InterfaceDef_i ( TAO_Repository_i *repo @@ -1258,3 +1259,5 @@ TAO_InterfaceDef_i::check_inherited (const char *name, } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index 5e445e692eb..1b32b2d23db 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_InterfaceDef_i : public virtual TAO_Container_i, public virtual TAO_Contained_i, @@ -224,6 +227,8 @@ private: // attribute name. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index 87aef1f0854..03c7bd1e6a3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "LocalInterfaceDef_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, LocalInterfaceDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i ( TAO_Repository_i *repo ) @@ -58,3 +59,4 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h index 3c9e5cc0568..aeb91cf0483 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_LocalInterfaceDef_i : public virtual TAO_InterfaceDef_i { // = TITLE @@ -66,10 +69,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_LOCALINTERFACEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 012996b39ee..affebfc885b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -11,6 +11,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -105,3 +107,5 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index dbb2a96fc96..df8d915f4c0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -34,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ModuleDef_i : public virtual TAO_Contained_i, public virtual TAO_ComponentModuleDef_i @@ -82,6 +85,8 @@ public: // From Contained_i's pure virtual function. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index d5ec549fa53..b5d73bba38e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -11,6 +11,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -60,3 +62,5 @@ TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) name.c_str () ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h index 068e48b200b..91425e09ad5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_NativeDef_i : public virtual TAO_TypedefDef_i { public: @@ -67,9 +70,10 @@ public: // From IDLType_i's pure virtual function. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_NATIVEDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 5a521a51e04..6b78e7c25e6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -15,6 +15,8 @@ ACE_RCSID (IFRService, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_OperationDef_i::TAO_OperationDef_i ( TAO_Repository_i *repo ) @@ -745,3 +747,5 @@ TAO_OperationDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) { return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index df4f19f4b33..d309e1fd06c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_OperationDef_i : public virtual TAO_Contained_i { // = TITLE @@ -172,6 +175,8 @@ public: 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/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index 66d1efe498f..13533f28a58 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -6,7 +6,8 @@ #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" -// Default Constructor +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Options::Options () : ior_output_file_ (ACE_OS::strdup ("if_repo.ior")), persistent_ (0), @@ -117,3 +118,5 @@ Options::support_multicast_discovery (void) const { return this->support_multicast_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h index 5251791c96c..c7e2eaed844 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -23,6 +24,9 @@ #include "ace/Singleton.h" #include "ifr_service_export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IFRService_Export Options { @@ -84,5 +88,7 @@ private: // Typedef an Options Singleton. typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* OPTIONS_H */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index b7f83ae5605..5fd58f1639f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "Repository_i.h" @@ -8,6 +7,8 @@ ACE_RCSID (IFRService, PrimitiveDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PrimitiveDef_i::TAO_PrimitiveDef_i ( TAO_Repository_i *repo ) @@ -138,3 +139,4 @@ TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return static_cast<CORBA::PrimitiveKind> (pkind); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h index e8cbba4016a..fef725da150 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_PrimitiveDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -87,10 +90,11 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_PRIMITIVEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp index 404060f8a6e..94404797eb9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp @@ -8,6 +8,8 @@ ACE_RCSID (IFRService, "RecursDef_i.cpp,v 1.1 2004/10/18 09:00:00 SMA Exp") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //----------------------------------------------------------------------------- // Class TAO_RecursiveDef_OuterScopes is a support class for StructDef_i.h and // UnionDef_i.h files. It creates a stack of outer structure definitions, used @@ -41,3 +43,5 @@ bool TAO_RecursiveDef_OuterScopes::SeenBefore( const ACE_TString &id ) const TAO_RecursiveDef_OuterScopes *TAO_RecursiveDef_OuterScopes::pIDsSeenAlready= 0; + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h index c9f4d9ba083..203c78c3236 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h @@ -34,6 +34,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //----------------------------------------------------------------------------- // Class TAO_RecursiveDef_OuterScopes is a support class for StructDef_i.h and // UnionDef_i.h files. It creates a stack of outer structure definitions, used @@ -56,6 +59,8 @@ private: // Data static const TAO_RecursiveDef_OuterScopes *pIDsSeenAlready; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index c9b85b4a2bd..484e829b333 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -18,6 +18,8 @@ ACE_RCSID (IFR_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, ACE_Configuration *config) @@ -1100,7 +1102,7 @@ TAO_Repository_i::lock (void) const return *this->lock_; } -const char *TAO_Repository_i::TAO_IFR_primitive_kinds[] = +const char * TAO_Repository_i::TAO_IFR_primitive_kinds[] = { "pk_null", "pk_void", @@ -1144,3 +1146,5 @@ TAO_Repository_i::shutdown (void) { this->orb_->shutdown (0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index 4df8834e7fb..e5adc59accc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -36,6 +37,8 @@ #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class IFR_Servant_Factory; class TAO_IDLType_i; @@ -362,7 +365,7 @@ protected: #undef GEN_IR_OBJECT private: - static const char *TAO_IFR_primitive_kinds[]; + static const char * TAO_IFR_primitive_kinds[]; // Set of strings corresponding to the CORBA::PrimitiveKind // enum values. @@ -374,6 +377,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index a510114bcc6..1d14b090c1e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -12,6 +12,7 @@ ACE_RCSID (IFRService, SequenceDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SequenceDef_i::TAO_SequenceDef_i ( TAO_Repository_i *repo @@ -264,3 +265,5 @@ TAO_SequenceDef_i::destroy_element_type ( break; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index bbd6be78144..85fad8e044f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_SequenceDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -138,6 +141,8 @@ private: // Destroys an anonymous non-primitive element type. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index 48f03cc741c..51b6729ed30 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -10,6 +10,7 @@ ACE_RCSID (IFRService, StringDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -126,3 +127,5 @@ TAO_StringDef_i::bound_i (CORBA::ULong bound "bound", bound); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h index 757f117e7c0..99b8ee22326 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_StringDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -100,9 +103,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_STRINGDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index 8bd307d707d..42c3faf06d5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -13,6 +13,7 @@ ACE_RCSID (IFRService, StructDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -304,3 +305,5 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members "count", count); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index fe09f286177..1eff26460cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -33,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_StructDef_i : public virtual TAO_TypedefDef_i, public virtual TAO_Container_i { @@ -101,6 +104,8 @@ public: 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/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index c97b5cc48a0..43e4bb44ed0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -10,6 +10,7 @@ ACE_RCSID (IFRService, TypedefDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_TypedefDef_i::TAO_TypedefDef_i ( TAO_Repository_i *repo @@ -77,3 +78,5 @@ TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index 32cab9bc159..b6037230db7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -33,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_TypedefDef_i : public virtual TAO_Contained_i, public virtual TAO_IDLType_i { @@ -63,6 +66,8 @@ public: // From Contained_i's pure virtual function. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index 96600c3ac55..e4cdc07b439 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -16,6 +16,7 @@ ACE_RCSID (IFRService, UnionDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -473,3 +474,5 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, break; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index 47e5c3d87bf..ea26a0a3de5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -33,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i, public virtual TAO_Container_i { @@ -137,11 +140,12 @@ private: const ACE_Configuration_Section_Key member_key, CORBA::UnionMember &member ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); // Used by members() to get each member's label value. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 3caa8264b41..bb8c41568ed 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -11,6 +11,7 @@ ACE_RCSID (IFRService, UsesDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -208,3 +209,5 @@ TAO_UsesDef_i::is_multiple_i ( "is_multiple", is_multiple); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index 52bdd5664a9..9ba4e6800dc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_UsesDef_i : public virtual TAO_Contained_i { // = TITLE @@ -110,6 +113,8 @@ public: 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/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 3c7bf2f5440..7c1fdcbc193 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -12,6 +12,7 @@ ACE_RCSID (IFRService, ValueBoxDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueBoxDef_i::TAO_ValueBoxDef_i ( TAO_Repository_i *repo @@ -135,3 +136,5 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def "boxed_type", boxed_type); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index ad655c50b46..287aef87fa5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ValueBoxDef_i : public virtual TAO_TypedefDef_i { public: @@ -89,6 +92,8 @@ public: 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/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 4d2ba44ff04..2447364b7ee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -14,6 +14,7 @@ ACE_RCSID (IFRService, ValueDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -1852,3 +1853,5 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc holder); desc.base_value = holder.fast_rep (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 7dd25212117..53c6b530e41 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -33,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ValueDef_i : public virtual TAO_Container_i, public virtual TAO_Contained_i, public virtual TAO_IDLType_i @@ -341,11 +344,10 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_VALUEDEF_I_H */ - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index 3d25b96ed3b..82bcab0b2dc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -12,6 +12,7 @@ ACE_RCSID (IFRService, ValueMemberDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueMemberDef_i::TAO_ValueMemberDef_i ( TAO_Repository_i *repo @@ -218,3 +219,5 @@ TAO_ValueMemberDef_i::access_i (CORBA::Visibility access "access", access); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index d512e45f406..aa0c859207b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_ValueMemberDef_i : public virtual TAO_Contained_i { // = TITLE @@ -120,6 +123,8 @@ public: 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/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 7f8c8bcc350..69efbfd6554 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -10,6 +10,7 @@ ACE_RCSID (IFRService, WstringDef_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_WstringDef_i::TAO_WstringDef_i ( TAO_Repository_i *repo @@ -126,3 +127,5 @@ TAO_WstringDef_i::bound_i (CORBA::ULong bound "bound", bound); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h index 62e9242c6c1..4e9d8faa2d5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IFRService_Export TAO_WstringDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -100,6 +103,8 @@ public: 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/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 105c2f6a738..da1e1a929a8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -14,9 +14,11 @@ ACE_RCSID (LoadBalancing, LB_CPU_Load_Average_Monitor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (const char * location_id, - const char * location_kind) +TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( + const char * location_id, + const char * location_kind) : location_ (1) { this->location_.length (1); @@ -238,3 +240,5 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #endif /* linux || sun || __hpux || __NetBSD__ || __APPLE__ */ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index 16e5a456e46..12bb7c1df80 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -24,6 +24,7 @@ #include "orbsvcs/CosLoadBalancingS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_CPU_Load_Average_Monitor @@ -95,6 +96,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_CPU_LOAD_AVERAGE_MONITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 11ae897574e..9b33673f9b4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -11,6 +11,8 @@ ACE_RCSID (LoadBalancing, LB_CPU_Utilization_Monitor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + double calc_cpu_loading (void) { static char buf[1024]; @@ -164,3 +166,5 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #endif /* linux || sun */ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 85798d6a44d..c369ce8e2c0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -7,7 +7,7 @@ * $Id$ * * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - * Ossama Othman <ossama@uci.edu> + * @author Ossama Othman <ossama@uci.edu> */ //============================================================================= @@ -25,6 +25,7 @@ #include "orbsvcs/CosLoadBalancingS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_CPU_Utilization_Monitor @@ -92,6 +93,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_CPU_UTILIZATION_MONITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index 57e266921c3..49a72b64eb4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -8,6 +8,8 @@ ACE_RCSID (LoadBalancing, LB_ClientComponent, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[]) { @@ -55,6 +57,7 @@ TAO_LB_ClientComponent::register_orb_initializer (void) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_LB_ClientComponent, ACE_TEXT ("LB_ClientComponent"), diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 4d960d74884..8431950aff4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -26,6 +26,8 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LB_ClientComponent * @@ -54,6 +56,7 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_LoadBalancing, TAO_LB_ClientComponent) ACE_STATIC_SVC_REQUIRE (TAO_LB_ClientComponent) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp index 4ab071fd528..8b73e8bbb0d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp @@ -7,6 +7,8 @@ ACE_RCSID (LoadBalancing, LB_ClientORBInitializer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_LB_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -37,3 +39,5 @@ TAO_LB_ClientORBInitializer::post_init ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h index 38338336bf3..595c7198ea0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h @@ -31,6 +31,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_ORBInitializer @@ -66,6 +67,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index fd3240d0bcd..fc4415857e8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -7,6 +7,7 @@ ACE_RCSID (LoadBalancing, TAO_LB_ClientRequestInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * TAO_LB_ClientRequestInterceptor::name ( @@ -109,3 +110,5 @@ TAO_LB_ClientRequestInterceptor::receive_other ( PortableInterceptor::ForwardRequest)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h index 6dbb4b71ae3..124a845a989 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h @@ -30,6 +30,8 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LB_ClientRequestInterceptor * @@ -103,6 +105,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index fcba172bb61..6a83695733e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -9,6 +9,8 @@ ACE_RCSID (LoadBalancing, LB_Component, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) { @@ -131,6 +133,7 @@ TAO_LB_Component::register_orb_initializer ( return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_LB_Component, ACE_TEXT ("LB_Component"), diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 0f290d8412b..26273daab93 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -26,6 +26,8 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LB_Component * @@ -56,6 +58,7 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_LoadBalancing, TAO_LB_Component) ACE_STATIC_SVC_REQUIRE (TAO_LB_Component) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index 5a5e40d8275..39660567fae 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -9,6 +9,8 @@ ACE_RCSID (LoadBalancing, LB_IORInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -183,3 +185,5 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index a8ba11a37bd..ca4b6f7ea01 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -29,6 +29,8 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_LB_LoadAlert; @@ -141,6 +143,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 7c65cc62d62..010a1e9eee1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -20,6 +20,7 @@ ACE_RCSID (LoadBalancing, #include "LB_LeastLoaded.inl" #endif /* defined INLINE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), @@ -636,3 +637,5 @@ TAO_LB_LeastLoaded::extract_float_property ( ACE_THROW (PortableGroup::InvalidProperty (property.nam, property.val)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index df043e104f3..902136d3326 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -27,6 +27,8 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_LB { /** @@ -215,6 +217,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "LB_LeastLoaded.inl" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl index cb650c93ba0..e59193f3c6f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Float TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load, CORBA::Float new_load) @@ -21,3 +23,5 @@ TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load, return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index 3c51e755ee5..8cc754b8283 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -9,15 +9,17 @@ ACE_RCSID (LoadBalancer, # include "LB_LoadAlert.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LB_LoadAlert::TAO_LB_LoadAlert (void) : alerted_ (0), lock_ () { } -// TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) -// { -// } +TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) +{ +} void TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -36,3 +38,5 @@ TAO_LB_LoadAlert::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->alerted_ = 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index 5c356ef3b41..b13ec10d0a9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -24,6 +24,7 @@ #include "orbsvcs/PortableGroupC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LoadBalancing_Export TAO_LB_LoadAlert : public virtual POA_CosLoadBalancing::LoadAlert @@ -55,16 +56,15 @@ public: /// by the LoadManager. CORBA::Boolean alerted (void) const; -protected: - +// protected: /// Destructor. /** * Protected destructor to enforce correct memory management via * reference counting. */ - //~TAO_LB_LoadAlert (void); - + virtual ~TAO_LB_LoadAlert (void); + private: /// Has this LoadAlert servant been alerted of a high load condition @@ -76,6 +76,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "LB_LoadAlert.inl" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl index 0f574a49206..abff1d3087e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_LB_LoadAlert::alerted (void) const { @@ -10,3 +12,5 @@ TAO_LB_LoadAlert::alerted (void) const return this->alerted_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 78eeeb187f6..efdbc3875ee 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -5,8 +5,12 @@ ACE_RCSID (LoadBalancing, LB_LoadAlertInfo, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void) : load_alert (), alerted (0) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 6736448e92c..47c3f7b384c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -24,6 +24,7 @@ #include "orbsvcs/CosLoadBalancingC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_LoadAlertInfo @@ -46,6 +47,7 @@ struct TAO_LB_LoadAlertInfo }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp deleted file mode 100644 index 23586970f71..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// -*- C++ -*- - -#include "LB_LoadAlertMap.h" - - -ACE_RCSID (LoadBalancing, - LB_LoadAlertMap, - "$Id$") - diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index 620ec2d3acb..e513edfca9a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -29,6 +29,7 @@ #include "ace/Hash_Map_Manager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// LoadAlertInfo hash map typedef. typedef ACE_Hash_Map_Manager_Ex< @@ -38,6 +39,7 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_LB_LoadAlertMap; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index 966c1c7d98d..84c2b575e11 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -7,6 +7,7 @@ ACE_RCSID (LoadBalancing, LB_LoadAlert_Handler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) { @@ -47,3 +48,5 @@ TAO_LB_LoadAlert_Handler::disable_alert_excep ( ACE_TEXT ("Exception caught when invoking ") ACE_TEXT ("LoadAlert::disable_alert()\n"))); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 68515987188..b4814587ed7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -20,6 +20,7 @@ ACE_RCSID (LoadBalancing, #include "LB_LoadAverage.inl" #endif /* defined INLINE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), @@ -449,3 +450,5 @@ TAO_LB_LoadAverage::extract_float_property ( ACE_THROW (PortableGroup::InvalidProperty (property.nam, property.val)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index 5fbf7360a43..cf951720031 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -7,7 +7,7 @@ * $Id$ * * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - * @author Ossama Othman <jai@dre.vanderbilt.edu> + * @author Ossama Othman <ossama@dre.vanderbilt.edu> */ //============================================================================= @@ -28,6 +28,8 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_LB { /** @@ -171,6 +173,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "LB_LoadAverage.inl" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl index 807367ef5c1..347374c1a7c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Float TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load, @@ -21,3 +22,5 @@ TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load, return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp deleted file mode 100644 index 5c084408100..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- - -#include "LB_LoadListMap.h" - -ACE_RCSID (LoadBalancing, - LB_LoadListMap, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h index ebfbb3b6cb7..4dd83f2e2b9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h @@ -29,6 +29,7 @@ #include "ace/Hash_Map_Manager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// LoadList hash map. typedef ACE_Hash_Map_Manager_Ex< @@ -38,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_LB_LoadListMap; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_LOAD_LIST_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index d30a2b159f1..f1d851a7126 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -27,6 +27,7 @@ ACE_RCSID (LoadBalancing, LB_LoadManager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadManager::TAO_LB_LoadManager (void) : reactor_ (0), @@ -1290,3 +1291,5 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info // this->poa_->reference_to_id ( // this->poa_->deactivate_object (); // } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index cc9b4ff0bf5..fd78e205f3b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -34,6 +34,7 @@ #include "orbsvcs/PortableGroup/PG_GenericFactory.h" #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LoadBalancing_Export TAO_LB_LoadManager : public virtual POA_CosLoadBalancing::LoadManager @@ -511,6 +512,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp deleted file mode 100644 index 8a40fdb1c95..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- - -#include "LB_LoadMap.h" - -ACE_RCSID (LoadBalancing, - LB_LoadMap, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h index 6e5778f4a55..2e75bbba1f3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h @@ -29,6 +29,7 @@ #include "ace/Hash_Map_Manager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Load hash map. typedef ACE_Hash_Map_Manager_Ex< @@ -38,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_LB_LoadMap; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_LOAD_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 50a13794544..ea04dc0bc50 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -21,6 +21,7 @@ ACE_RCSID (LoadBalancing, #include "LB_LoadMinimum.inl" #endif /* defined INLINE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), @@ -659,3 +660,5 @@ TAO_LB_LoadMinimum::extract_float_property ( ACE_THROW (PortableGroup::InvalidProperty (property.nam, property.val)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 7d894bb090a..33f8bd1f19e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -28,6 +28,9 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_LB { /** @@ -194,6 +197,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "LB_LoadMinimum.inl" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl index 4f096fa4040..dc120b38783 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Float TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load, CORBA::Float new_load) @@ -20,3 +22,5 @@ TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load, return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp deleted file mode 100644 index 703c0515709..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- - -#include "LB_Location_Index_Map.h" - -ACE_RCSID (LoadBalancing, - LB_Location_Index, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h index b99c5437779..a08694dd2d0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h @@ -27,6 +27,7 @@ #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Location index map. typedef ACE_Hash_Map_Manager_Ex< @@ -36,6 +37,8 @@ typedef ACE_Hash_Map_Manager_Ex< ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex> TAO_LB_Location_Index_Map; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_LOCATION_INDEX_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp index 8d4b359b479..2c2f97113e7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp @@ -8,6 +8,7 @@ ACE_RCSID (LoadBalancing, LB_MemberLocator, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_MemberLocator::TAO_LB_MemberLocator ( TAO_LB_LoadManager * lm) @@ -71,3 +72,5 @@ TAO_LB_MemberLocator::postinvoke ( ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index ccdc9af7247..e376937f0a5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -25,6 +25,8 @@ #include "tao/PortableServer/ServantLocatorC.h" #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class TAO_LB_LoadManager; @@ -83,6 +85,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_MEMBER_LOCATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp deleted file mode 100644 index ad8142f3e24..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// -*- C++ -*- - -#include "LB_LoadMap.h" - - -ACE_RCSID (LoadBalancing, - LB_MonitorMap, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 035486af6d3..128c89d6bd7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -10,6 +10,9 @@ ACE_RCSID (LoadBalancing, LB_ORBInitializer, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LB_ORBInitializer::TAO_LB_ORBInitializer ( const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -87,3 +90,5 @@ TAO_LB_ORBInitializer::post_init ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index ffac81934f0..b37289443f6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -22,8 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/LocalObject.h" #include "tao/PI/PI.h" +#include "tao/LocalObject.h" +#include "tao/Versioned_Namespace.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -32,6 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_ORBInitializer @@ -97,6 +99,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index d525001fc3d..1bdc3a20eca 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -12,6 +12,8 @@ ACE_RCSID (LoadBalancing, #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // The number of different object groups to support. #ifndef TAO_LB_ORF_GROUP_TABLE_SIZE const size_t TAO_LB_ORF_GROUP_TABLE_SIZE = 16; @@ -253,3 +255,5 @@ TAO_LB_ObjectReferenceFactory::load_managed_object (const char * repository_id, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index 729ac23aca5..81fddbe05bf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -33,6 +33,8 @@ #include "ace/Null_Mutex.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LB_ObjectReferenceFactory * @@ -165,6 +167,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index eb431a84ade..4bce39836d7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -9,6 +9,8 @@ ACE_RCSID (LoadBalancing, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void) : monitor_map_ (0), load_manager_ (0) @@ -78,3 +80,5 @@ TAO_LB_Pull_Handler::handle_timeout ( return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h index 5649c74f263..1d68391ad59 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h @@ -26,11 +26,11 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Forward declarations. class TAO_LB_LoadManager; - /** * @class TAO_LB_Pull_Handler * @@ -65,6 +65,9 @@ private: TAO_LB_LoadManager * load_manager_; }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LB_PULL_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index ff1f158b0e3..9a5106cc842 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -14,12 +14,13 @@ ACE_RCSID (LoadBalancing, static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT; #endif /* ACE_HAS_PTHREADS_STD */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern "C" void tao_lb_random_init_routine (void) { ACE_OS::srand (static_cast<unsigned int> (ACE_OS::time ())); } - TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)) { @@ -175,3 +176,5 @@ TAO_LB_Random::init (void) ::tao_lb_random_init_routine (); #endif /* ACE_HAS_PTHREADS_STD */ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 92eb9881ce8..af5bea2b038 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -23,6 +23,8 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LB_Random * @@ -114,6 +116,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 28507f0b1d6..d0163cff990 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -11,6 +11,8 @@ ACE_RCSID (LoadBalancing, LB_RoundRobin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), lock_ (), @@ -165,3 +167,5 @@ TAO_LB_RoundRobin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index 04f810908d1..a96a1120223 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -26,6 +26,9 @@ #include "orbsvcs/CosLoadBalancingS.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LB_RoundRobin_Strategy * @@ -117,6 +120,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* LB_ROUND_ROBIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index 6b9a9a48be3..edd948de75a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -10,6 +10,7 @@ ACE_RCSID (LoadBalancing, LB_ServerRequestInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor ( TAO_LB_LoadAlert & load_alert) @@ -177,3 +178,5 @@ TAO_LB_ServerRequestInterceptor::send_other ( ACE_TEXT ("LOCATION FORWARDED\n"))); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index dc41b7dbf7b..a3a94008a27 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -33,6 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LB_LoadAlert; @@ -113,6 +114,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h index 6b1fcfd8b98..9c65aba972c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h @@ -22,6 +22,9 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL #ifndef TAO_LB_PULL_HANDLER_INTERVAL /// The interval in seconds the load balancer queries registered load @@ -35,6 +38,7 @@ const long TAO_LB_PULL_HANDLER_INTERVAL = 5; const long TAO_LB_PULL_HANDLER_RESTART = 5; #endif /* TAO_LB_PULL_HANDLER_RESTART */ +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index cb4110ac0f1..76fb499e243 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -1438,16 +1438,11 @@ libTAO_CosLoadBalancing_la_SOURCES = \ LoadBalancing/LB_LeastLoaded.cpp \ LoadBalancing/LB_LoadAlert.cpp \ LoadBalancing/LB_LoadAlertInfo.cpp \ - LoadBalancing/LB_LoadAlertMap.cpp \ LoadBalancing/LB_LoadAlert_Handler.cpp \ LoadBalancing/LB_LoadAverage.cpp \ - LoadBalancing/LB_LoadListMap.cpp \ LoadBalancing/LB_LoadManager.cpp \ - LoadBalancing/LB_LoadMap.cpp \ LoadBalancing/LB_LoadMinimum.cpp \ - LoadBalancing/LB_Location_Index_Map.cpp \ LoadBalancing/LB_MemberLocator.cpp \ - LoadBalancing/LB_MonitorMap.cpp \ LoadBalancing/LB_ORBInitializer.cpp \ LoadBalancing/LB_ObjectReferenceFactory.cpp \ LoadBalancing/LB_Pull_Handler.cpp \ |