diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-14 22:03:50 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-14 22:03:50 +0000 |
| commit | d82f0771e937769da4577e271af16f77005da497 (patch) | |
| tree | fefa0b410111047bf0bab244113a81f3904fa1dc | |
| parent | a67285658f66a3e7c750d04843219ae6ef39167b (diff) | |
| download | ATCD-d82f0771e937769da4577e271af16f77005da497.tar.gz | |
ChangeLogTag:Mon Nov 14 13:54:08 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
440 files changed, 2762 insertions, 581 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c4e37bd4352..ad110465bf6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,450 @@ +Mon Nov 14 13:54:08 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Makefile.am (libTAO_PortableGroup_la_SOURCES): + * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp: + + Removed empty map/set source files. + + * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp: + * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h: + * orbsvcs/orbsvcs/Log/EventLogConsumer.cpp: + * orbsvcs/orbsvcs/Log/EventLogConsumer.h: + * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp: + * orbsvcs/orbsvcs/Log/EventLogFactory_i.h: + * orbsvcs/orbsvcs/Log/EventLogNotification.cpp: + * orbsvcs/orbsvcs/Log/EventLogNotification.h: + * orbsvcs/orbsvcs/Log/EventLog_i.cpp: + * orbsvcs/orbsvcs/Log/EventLog_i.h: + * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp: + * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h: + * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp: + * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h: + * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp: + * orbsvcs/orbsvcs/Log/Hash_LogStore.h: + * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp: + * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h: + * orbsvcs/orbsvcs/Log/Iterator_i.cpp: + * orbsvcs/orbsvcs/Log/Iterator_i.h: + * orbsvcs/orbsvcs/Log/LogActivator.cpp: + * orbsvcs/orbsvcs/Log/LogActivator.h: + * orbsvcs/orbsvcs/Log/LogMgr_i.cpp: + * orbsvcs/orbsvcs/Log/LogMgr_i.h: + * orbsvcs/orbsvcs/Log/LogNotification.cpp: + * orbsvcs/orbsvcs/Log/LogNotification.h: + * orbsvcs/orbsvcs/Log/LogRecordStore.cpp: + * orbsvcs/orbsvcs/Log/LogRecordStore.h: + * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp: + * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h: + * orbsvcs/orbsvcs/Log/LogStore.h: + * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp: + * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h: + * orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp: + * orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h: + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h: + * orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp: + * orbsvcs/orbsvcs/Log/Log_Flush_Handler.h: + * orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h: + * orbsvcs/orbsvcs/Log/Log_i.cpp: + * orbsvcs/orbsvcs/Log/Log_i.h: + * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp: + * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h: + * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp: + * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h: + * orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp: + * orbsvcs/orbsvcs/Log/NotifyLogNotification.h: + * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp: + * orbsvcs/orbsvcs/Log/NotifyLog_i.h: + * orbsvcs/orbsvcs/Log/PersistStore.cpp: + * orbsvcs/orbsvcs/Log/PersistStore.h: + * orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp: + * orbsvcs/orbsvcs/Log/RTEventLogConsumer.h: + * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp: + * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h: + * orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp: + * orbsvcs/orbsvcs/Log/RTEventLogNotification.h: + * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp: + * orbsvcs/orbsvcs/Log/RTEventLog_i.h: + * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h: + * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h: + * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp: + * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h: + * orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp: + * orbsvcs/orbsvcs/Metrics/Metrics_Logger.h: + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h: + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i: + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp: + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h: + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i: + * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp: + * orbsvcs/orbsvcs/Metrics/Metrics_Utils.h: + * orbsvcs/orbsvcs/Metrics/Metrics_Utils.i: + * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp: + * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h: + * orbsvcs/orbsvcs/Naming/Entries.cpp: + * orbsvcs/orbsvcs/Naming/Entries.h: + * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp: + * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h: + * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Naming_Client.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Client.h: + * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h: + * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Loader.h: + * orbsvcs/orbsvcs/Naming/Naming_Server.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Server.h: + * orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Service_Container.h: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h: + * orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp: + * orbsvcs/orbsvcs/Naming/Persistent_Entries.h: + * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Storable.h: + * orbsvcs/orbsvcs/Naming/Storable.inl: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h: + * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h: + * orbsvcs/orbsvcs/Notify/Admin.cpp: + * orbsvcs/orbsvcs/Notify/Admin.h: + * orbsvcs/orbsvcs/Notify/Admin.inl: + * orbsvcs/orbsvcs/Notify/AdminProperties.cpp: + * orbsvcs/orbsvcs/Notify/AdminProperties.h: + * orbsvcs/orbsvcs/Notify/AdminProperties.inl: + * orbsvcs/orbsvcs/Notify/Bit_Vector.cpp: + * orbsvcs/orbsvcs/Notify/Bit_Vector.h: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h: + * orbsvcs/orbsvcs/Notify/Builder.cpp: + * orbsvcs/orbsvcs/Notify/Builder.h: + * orbsvcs/orbsvcs/Notify/Consumer.cpp: + * orbsvcs/orbsvcs/Notify/Consumer.h: + * orbsvcs/orbsvcs/Notify/Consumer.inl: + * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp: + * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h: + * orbsvcs/orbsvcs/Notify/Consumer_Map.h: + * orbsvcs/orbsvcs/Notify/Container_T.cpp: + * orbsvcs/orbsvcs/Notify/Container_T.h: + * orbsvcs/orbsvcs/Notify/Container_T.inl: + * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp: + * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h: + * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp: + * orbsvcs/orbsvcs/Notify/CosNotify_Service.h: + * orbsvcs/orbsvcs/Notify/Default_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Default_Factory.h: + * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp: + * orbsvcs/orbsvcs/Notify/Delivery_Request.h: + * orbsvcs/orbsvcs/Notify/Delivery_Request.inl: + * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp: + * orbsvcs/orbsvcs/Notify/ETCL_Filter.h: + * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp: + * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h: + * orbsvcs/orbsvcs/Notify/Event.cpp: + * orbsvcs/orbsvcs/Notify/Event.h: + * orbsvcs/orbsvcs/Notify/Event.inl: + * orbsvcs/orbsvcs/Notify/EventChannel.cpp: + * orbsvcs/orbsvcs/Notify/EventChannel.h: + * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp: + * orbsvcs/orbsvcs/Notify/EventChannelFactory.h: + * orbsvcs/orbsvcs/Notify/EventType.cpp: + * orbsvcs/orbsvcs/Notify/EventType.h: + * orbsvcs/orbsvcs/Notify/EventType.inl: + * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp: + * orbsvcs/orbsvcs/Notify/EventTypeSeq.h: + * orbsvcs/orbsvcs/Notify/Event_Manager.cpp: + * orbsvcs/orbsvcs/Notify/Event_Manager.h: + * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp: + * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h: + * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl: + * orbsvcs/orbsvcs/Notify/Event_Map_T.cpp: + * orbsvcs/orbsvcs/Notify/Event_Map_T.h: + * orbsvcs/orbsvcs/Notify/Event_Map_T.inl: + * orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h: + * orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h: + * orbsvcs/orbsvcs/Notify/Factory.h: + * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp: + * orbsvcs/orbsvcs/Notify/FilterAdmin.h: + * orbsvcs/orbsvcs/Notify/FilterAdmin.inl: + * orbsvcs/orbsvcs/Notify/FilterFactory.h: + * orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp: + * orbsvcs/orbsvcs/Notify/Find_Worker_T.h: + * orbsvcs/orbsvcs/Notify/Find_Worker_T.inl: + * orbsvcs/orbsvcs/Notify/ID_Factory.cpp: + * orbsvcs/orbsvcs/Notify/ID_Factory.h: + * orbsvcs/orbsvcs/Notify/ID_Factory.inl: + * orbsvcs/orbsvcs/Notify/Method_Request.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Event.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl: + * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp: + * orbsvcs/orbsvcs/Notify/Name_Value_Pair.h: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h: + * orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Extensions.h: + * orbsvcs/orbsvcs/Notify/Object.cpp: + * orbsvcs/orbsvcs/Notify/Object.h: + * orbsvcs/orbsvcs/Notify/Object.inl: + * orbsvcs/orbsvcs/Notify/POA_Helper.cpp: + * orbsvcs/orbsvcs/Notify/POA_Helper.h: + * orbsvcs/orbsvcs/Notify/POA_Helper.inl: + * orbsvcs/orbsvcs/Notify/Peer.cpp: + * orbsvcs/orbsvcs/Notify/Peer.h: + * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp: + * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h: + * orbsvcs/orbsvcs/Notify/Properties.cpp: + * orbsvcs/orbsvcs/Notify/Properties.h: + * orbsvcs/orbsvcs/Notify/Properties.inl: + * orbsvcs/orbsvcs/Notify/Property.h: + * orbsvcs/orbsvcs/Notify/PropertySeq.cpp: + * orbsvcs/orbsvcs/Notify/PropertySeq.h: + * orbsvcs/orbsvcs/Notify/PropertySeq.inl: + * orbsvcs/orbsvcs/Notify/Property_Boolean.cpp: + * orbsvcs/orbsvcs/Notify/Property_Boolean.h: + * orbsvcs/orbsvcs/Notify/Property_Boolean.inl: + * orbsvcs/orbsvcs/Notify/Property_T.cpp: + * orbsvcs/orbsvcs/Notify/Property_T.h: + * orbsvcs/orbsvcs/Notify/Property_T.inl: + * orbsvcs/orbsvcs/Notify/Proxy.cpp: + * orbsvcs/orbsvcs/Notify/Proxy.h: + * orbsvcs/orbsvcs/Notify/Proxy.inl: + * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Notify/ProxyConsumer.h: + * orbsvcs/orbsvcs/Notify/ProxyConsumer.inl: + * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp: + * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h: + * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp: + * orbsvcs/orbsvcs/Notify/ProxySupplier.h: + * orbsvcs/orbsvcs/Notify/ProxySupplier.inl: + * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp: + * orbsvcs/orbsvcs/Notify/ProxySupplier_T.h: + * orbsvcs/orbsvcs/Notify/Proxy_T.cpp: + * orbsvcs/orbsvcs/Notify/Proxy_T.h: + * orbsvcs/orbsvcs/Notify/QoSProperties.cpp: + * orbsvcs/orbsvcs/Notify/QoSProperties.h: + * orbsvcs/orbsvcs/Notify/QoSProperties.inl: + * orbsvcs/orbsvcs/Notify/RT_Builder.cpp: + * orbsvcs/orbsvcs/Notify/RT_Builder.h: + * orbsvcs/orbsvcs/Notify/RT_Factory.cpp: + * orbsvcs/orbsvcs/Notify/RT_Factory.h: + * orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp: + * orbsvcs/orbsvcs/Notify/RT_Notify_Service.h: + * orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp: + * orbsvcs/orbsvcs/Notify/RT_POA_Helper.h: + * orbsvcs/orbsvcs/Notify/RT_Properties.cpp: + * orbsvcs/orbsvcs/Notify/RT_Properties.h: + * orbsvcs/orbsvcs/Notify/RT_Properties.inl: + * orbsvcs/orbsvcs/Notify/Random_File.cpp: + * orbsvcs/orbsvcs/Notify/Random_File.h: + * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp: + * orbsvcs/orbsvcs/Notify/Reactive_Task.h: + * orbsvcs/orbsvcs/Notify/Reactive_Task.inl: + * orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp: + * orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h: + * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp: + * orbsvcs/orbsvcs/Notify/Reconnection_Registry.h: + * orbsvcs/orbsvcs/Notify/Refcountable.cpp: + * orbsvcs/orbsvcs/Notify/Refcountable.h: + * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h: + * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl: + * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp: + * orbsvcs/orbsvcs/Notify/Routing_Slip.h: + * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp: + * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h: + * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp: + * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h: + * orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp: + * orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h: + * orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp: + * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h: + * orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl: + * orbsvcs/orbsvcs/Notify/Service.cpp: + * orbsvcs/orbsvcs/Notify/Service.h: + * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp: + * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h: + * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp: + * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h: + * orbsvcs/orbsvcs/Notify/Supplier.cpp: + * orbsvcs/orbsvcs/Notify/Supplier.h: + * orbsvcs/orbsvcs/Notify/Supplier.inl: + * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp: + * orbsvcs/orbsvcs/Notify/SupplierAdmin.h: + * orbsvcs/orbsvcs/Notify/Supplier_Map.h: + * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp: + * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h: + * orbsvcs/orbsvcs/Notify/Timer.h: + * orbsvcs/orbsvcs/Notify/Timer_Queue.cpp: + * orbsvcs/orbsvcs/Notify/Timer_Queue.h: + * orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp: + * orbsvcs/orbsvcs/Notify/Timer_Reactor.h: + * orbsvcs/orbsvcs/Notify/Topology_Factory.h: + * orbsvcs/orbsvcs/Notify/Topology_Loader.cpp: + * orbsvcs/orbsvcs/Notify/Topology_Loader.h: + * orbsvcs/orbsvcs/Notify/Topology_Object.cpp: + * orbsvcs/orbsvcs/Notify/Topology_Object.h: + * orbsvcs/orbsvcs/Notify/Topology_Object.inl: + * orbsvcs/orbsvcs/Notify/Topology_Saver.cpp: + * orbsvcs/orbsvcs/Notify/Topology_Saver.h: + * orbsvcs/orbsvcs/Notify/Worker_Task.cpp: + * orbsvcs/orbsvcs/Notify/Worker_Task.h: + * orbsvcs/orbsvcs/Notify/XML_Loader.cpp: + * orbsvcs/orbsvcs/Notify/XML_Loader.h: + * orbsvcs/orbsvcs/Notify/XML_Saver.cpp: + * orbsvcs/orbsvcs/Notify/XML_Saver.h: + * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp: + * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h: + * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp: + * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h: + * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h: + * orbsvcs/orbsvcs/PortableGroup/GOA.cpp: + * orbsvcs/orbsvcs/PortableGroup/GOA.h: + * orbsvcs/orbsvcs/PortableGroup/MIOP.cpp: + * orbsvcs/orbsvcs/PortableGroup/MIOP.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h: + * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h: + * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl: + * orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl: + * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h: + * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Operators.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl: + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h: + * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Utils.h: + * orbsvcs/orbsvcs/PortableGroup/PG_conf.h: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h: + * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp: + * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h: + + Added versioned namespace support. + Mon Nov 14 15:00:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_traits.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 977e11d580b..b8704fe0988 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -5,6 +5,8 @@ ACE_RCSID (Log, BasicLogFactory_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void) { } @@ -118,7 +120,7 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, CORBA::RepositoryId TAO_BasicLogFactory_i::create_repositoryid () { - return CORBA::string_dup("IDL:omg.org/DsLogAdmin:BasicLog:1.0"); + return CORBA::string_dup ("IDL:omg.org/DsLogAdmin:BasicLog:1.0"); } PortableServer::ServantBase* @@ -141,3 +143,5 @@ TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id return basic_log_i; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index 2d3820014a3..f6cc8f4113a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -11,7 +11,7 @@ * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * @David A. Hanvey <d.hanvey@qub.ac.uk> + * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -35,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_BasicLogActivator; /** @@ -97,6 +99,8 @@ protected: DsLogAdmin::LogMgr_var log_mgr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index 852317d4d42..5e005ee70c6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -6,6 +6,8 @@ ACE_RCSID (Log, EventLogConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) : log_ (log) { @@ -95,4 +97,4 @@ TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index 72f5a5b772e..7e93c2a4814 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -37,6 +37,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_EventLog_i; class TAO_EventLogFactory_i; @@ -90,6 +92,8 @@ private: TAO_EventLog_i *log_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index c6d7c41be56..ceac8976ab8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Log, EventLogFactory_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) { TAO_CEC_Default_Factory::init_svcs (); @@ -246,3 +248,5 @@ TAO_EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) { return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index 230c3c54882..b17a0c7af89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -10,8 +10,7 @@ * * * @author Rob Ruff <rruff@scires.com> - * @David A. Hanvey <d.hanvey@qub.ac.uk> - * + * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -38,6 +37,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_EventLog_i; class TAO_EventLogNotification; @@ -141,6 +142,8 @@ protected: CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 7efe128c8b3..130274497d7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -7,6 +7,8 @@ ACE_RCSID (Log, EventLogNotification, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec) : TAO_LogNotification (), event_channel_ (CosEventChannelAdmin::EventChannel::_duplicate (ec)) { @@ -47,4 +49,4 @@ TAO_EventLogNotification::send_notification (const CORBA::Any& any consumer_->push (any ACE_ENV_ARG_PARAMETER); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index c73bcf2efba..ad6efbb0c7c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -8,10 +8,7 @@ * * Methods to enable log-generated events. * - * * @author D A Hanvey <d.hanvey@qub.ac.uk> - * - * */ //============================================================================= @@ -37,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_EventLogNotification * @@ -83,6 +82,8 @@ private: CosEventChannelAdmin::ProxyPushConsumer_var consumer_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index a7d8a257ff7..87df3394e48 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -6,6 +6,9 @@ ACE_RCSID (Log, EventLog_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, TAO_LogMgr_i &logmgr_i, @@ -129,3 +132,5 @@ TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) { return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index 24e0eaeae36..e5bb5bce876 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // ============================================================================ /** @@ -11,7 +11,7 @@ * to write events to the Log. * * @author Rob Ruff <rruff@scires.com> - * @D A Hanvey <d.hanvey@qub.ac.uk> + * @author D A Hanvey <d.hanvey@qub.ac.uk> */ // ============================================================================ @@ -39,6 +39,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_EventLog_i; class TAO_EventLogFactory_i; @@ -125,6 +127,8 @@ private: PortableServer::POA_var poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index 8a578c28207..31489a151e5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -7,13 +7,15 @@ ACE_RCSID (Log, Hash_Iterator_i, "$Id$") -TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (ACE_Reactor* reactor, - TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter, - TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end, - CORBA::ULong start, - const char *constraint, - CORBA::ULong max_rec_list_len - ) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Hash_Iterator_i::TAO_Hash_Iterator_i ( + ACE_Reactor* reactor, + TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter, + TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end, + CORBA::ULong start, + const char *constraint, + CORBA::ULong max_rec_list_len) : TAO_Iterator_i(reactor), iter_ (iter), iter_end_ (iter_end), @@ -95,3 +97,5 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, return rec_list; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h index 548b1df2004..d882a3ad562 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -8,10 +8,8 @@ * * Implementation of the DsLogAdmin::Iterator interface. * - * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * */ //============================================================================= @@ -34,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Hash_Iterator_i * @@ -82,6 +82,8 @@ private: CORBA::ULong max_rec_list_len_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index fb9b4a0db3f..c827a61706e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -12,12 +12,14 @@ ACE_RCSID (Log, Hash_LogRecordStore, "$Id$") -TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (CORBA::ORB_ptr orb, - DsLogAdmin::LogId logid, - DsLogAdmin::LogFullActionType log_full_action, - CORBA::ULongLong max_size, - const DsLogAdmin::CapacityAlarmThresholdList* thresholds - ) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( + CORBA::ORB_ptr orb, + DsLogAdmin::LogId logid, + DsLogAdmin::LogFullActionType log_full_action, + CORBA::ULongLong max_size, + const DsLogAdmin::CapacityAlarmThresholdList* thresholds) : maxid_ (0), max_size_ (max_size), id_ (logid), @@ -786,3 +788,5 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size this->max_size_ = size; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index 7073383de53..63443470e51 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -33,6 +33,8 @@ #define LOG_DEFAULT_MAX_REC_LIST_LEN 100 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Hash_LogRecordStore * @@ -313,5 +315,7 @@ protected: mutable ACE_SYNCH_RW_MUTEX lock_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_HASH_LOG_RECORD_STORE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 2eca24c2127..16a3d50b9c8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -7,6 +7,8 @@ ACE_RCSID (Log, Hash_LogStore, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Hash_LogStore::TAO_Hash_LogStore(CORBA::ORB_ptr orb, TAO_LogMgr_i* mgr) : next_id_ (0), orb_ (CORBA::ORB::_duplicate (orb)), @@ -256,3 +258,5 @@ TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id return recordstore; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h index 16b9f300e6c..37e03007548 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -8,7 +8,7 @@ * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * @David A. Hanvey <d.hanvey@qub.ac.uk> + * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -30,6 +30,9 @@ #include "log_serv_export.h" class ACE_Reactor; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_Hash_LogRecordStore; @@ -120,6 +123,8 @@ private: TAO_LogMgr_i* mgr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_HASH_LOGSTORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp index 9c2164d58bd..91f7c455423 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (Log, Hash_Persistence_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Hash_Persistence_Strategy::TAO_Hash_Persistence_Strategy() { } @@ -20,3 +22,5 @@ TAO_Hash_Persistence_Strategy::create_log_store(CORBA::ORB_ptr orb, { return new TAO_Hash_LogStore (orb, mgr); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h index 44386117ce6..3c55c9a730f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -8,7 +8,7 @@ * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * @David A. Hanvey <d.hanvey@qub.ac.uk> + * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -24,6 +24,8 @@ #include "orbsvcs/Log/Log_Persistence_Strategy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Hash_Persistence_Strategy * @@ -50,6 +52,8 @@ public: private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_HASH_PERSISTENCE_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 8c9c1331526..d26dc48d882 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -4,6 +4,9 @@ ACE_RCSID (Log, Iterator_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // iterator inactivity timeout ACE_Time_Value TAO_Iterator_i::timeout_(60 * 60); @@ -66,3 +69,5 @@ TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index ad3b1eec975..6571a64b64d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -36,6 +36,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Iterator_i * @@ -79,6 +81,8 @@ protected: virtual int handle_timeout (const ACE_Time_Value&, const void *); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp index c61096e9fed..5f7c64cd724 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp @@ -7,6 +7,8 @@ ACE_RCSID (Log, #if (TAO_HAS_MINIMUM_POA == 0) #include "orbsvcs/Log/LogMgr_i.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LogActivator::TAO_LogActivator (TAO_LogMgr_i &logmgr_i) : logmgr_i_ (logmgr_i) { @@ -51,4 +53,6 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&, } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h index 52905fa6988..ac31237bbc4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/ServantActivatorC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // forward declarations class TAO_LogMgr_i; @@ -68,6 +70,8 @@ private: TAO_LogMgr_i& logmgr_i_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 3cba3e42944..c9525aba01f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -10,6 +10,9 @@ ACE_RCSID (Log, LogMgr_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LogMgr_i::TAO_LogMgr_i () : logstore_ (0) { @@ -271,3 +274,5 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index bf8dc3c9483..8fc9731083a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -28,6 +28,8 @@ #include "orbsvcs/Log/Log_Persistence_Strategy.h" #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LogMgr_i * @brief Log Factory @@ -188,5 +190,7 @@ private: TAO_LogStore* logstore_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_LOGMGR_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 027f9ad103d..138c96efb03 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -8,14 +8,14 @@ ACE_RCSID (Log, LogNotification, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LogNotification::TAO_LogNotification (void) { - // No-Op. } TAO_LogNotification::~TAO_LogNotification (void) { - // No-Op. } void @@ -413,3 +413,5 @@ TAO_LogNotification::send_notification (const CORBA::Any & /* any */ ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index dc562f6e2ca..8d76e917e00 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -27,6 +27,7 @@ #include "orbsvcs/DsLogNotificationS.h" #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LogNotification @@ -177,6 +178,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_LOG_NOTIFICATION_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 885e0c756a9..278039ac40e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -4,12 +4,14 @@ ACE_RCSID (Log, LogRecordStore, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LogRecordStore::TAO_LogRecordStore (void) { - //No-Op. } TAO_LogRecordStore::~TAO_LogRecordStore (void) { - // No-Op. } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 59b055aa9ea..4ac96f148d9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -25,6 +25,8 @@ #include "orbsvcs/DsLogAdminC.h" #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LogRecordStore * @@ -218,5 +220,7 @@ protected: private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_LOG_RECORD_STORE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp index 2af2f073dfd..c3e164fdf1b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Log, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_LogRecordStore::TAO_LogRecordStore (CORBA::ULongLong max_size, DsLogAdmin::LogId logid, CORBA::ULong max_rec_list_len) @@ -204,3 +206,5 @@ TAO_LogRecordStore::get_storage (void) { return rec_hash_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h index 67519082f4e..2d63062e069 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h @@ -38,6 +38,8 @@ #define LOG_DEFAULT_MAX_REC_LIST_LEN 100 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_LogRecordStore * @@ -152,5 +154,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore char file_name_[256]; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_LOG_RECORD_STORE_PERSIST_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index 20e788e1769..d7d73e490ab 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -25,6 +25,8 @@ #include "orbsvcs/DsLogAdminC.h" #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogRecordStore; class TAO_Log_Serv_Export TAO_LogStore @@ -99,6 +101,8 @@ protected: private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_LOGSTORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp index db312eca963..d153bbe2714 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp @@ -6,6 +6,9 @@ ACE_RCSID (Log, Log_Compaction_Handler, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Log_Compaction_Handler::TAO_Log_Compaction_Handler (ACE_Reactor* reactor, TAO_Log_i* log, const ACE_Time_Value& interval) @@ -59,3 +62,5 @@ TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h index 4294d8a68b9..4e7f7254df0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h @@ -12,12 +12,21 @@ #ifndef TAO_TLS_COMPACTION_HANDLER_H #define TAO_TLS_COMPACTION_HANDLER_H +#include "log_serv_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Versioned_Namespace.h" + #include "ace/Event_Handler.h" #include "ace/Time_Value.h" -#include "log_serv_export.h" -// forward decls class ACE_Reactor; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Log_i; /// @class TAO_Log_Compaction_Handler @@ -50,4 +59,6 @@ private: const ACE_Time_Value interval_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_LOG_COMPACTION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index 68687e3124e..6e03cd2c04c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -6,6 +6,7 @@ ACE_RCSID (Log, Log_Constraint_Interpreter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( const char *constraints @@ -44,3 +45,5 @@ TAO_Log_Constraint_Interpreter::evaluate ( return retval; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 7fd1a319398..24be44df2c9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -29,6 +29,8 @@ #include "orbsvcs/DsLogAdminC.h" #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Log_Constraint_Visitor; /** @@ -61,5 +63,8 @@ public: /// the evaluator. CORBA::Boolean evaluate (TAO_Log_Constraint_Visitor &evaluator); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LOG_CONSTRAINT_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 5ce626f3703..13ed74f6503 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -17,6 +17,8 @@ ACE_RCSID (Log, Log_Constraint_Visitors, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor ( DsLogAdmin::LogRecord &rec) :rec_ (rec) @@ -1377,3 +1379,5 @@ TAO_Log_Constraint_Visitor::simple_type_match (int expr_type, return 0; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index 06a6549aff3..b116d82a2d4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -30,6 +30,8 @@ #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ETCL_Constraint; class TAO_ETCL_Literal_Constraint; class TAO_Log_Property_Constraint; @@ -121,5 +123,7 @@ private: DsLogAdmin::LogRecord &rec_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LOG_CONSTRAINT_VISITORS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp index 38d31de5774..122d35c486c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp @@ -5,6 +5,8 @@ ACE_RCSID (Log, Log_Flush_Handler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Log_Flush_Handler::TAO_Log_Flush_Handler (ACE_Reactor* reactor, TAO_Log_i* log, const ACE_Time_Value& interval) @@ -53,3 +55,5 @@ TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h index c659fde95ae..d1ab436a70f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h @@ -12,12 +12,21 @@ #ifndef TAO_TLS_FLUSH_HANDLER_H #define TAO_TLS_FLUSH_HANDLER_H +#include "log_serv_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Versioned_Namespace.h" + #include "ace/Event_Handler.h" #include "ace/Time_Value.h" -#include "log_serv_export.h" -// forward decls class ACE_Reactor; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Log_i; /// @class TAO_Log_Flush_Handler @@ -50,4 +59,6 @@ private: ACE_Time_Value interval_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_LOG_FLUSH_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h index 796c12663ef..bdd40dba9dd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h @@ -23,8 +23,11 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogStore; class TAO_LogMgr_i; @@ -51,6 +54,8 @@ public: private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_PERSISTENCE_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 5f4dfbce233..03feb95791c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Log, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Log Compaction Interval const ACE_Time_Value TAO_Log_i::log_compaction_interval_ = ACE_Time_Value(60); @@ -1283,3 +1285,5 @@ TAO_Log_i::validate_capacity_alarm_thresholds ( return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 502199bab26..2e4a35ecf2d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -34,6 +34,8 @@ #include "ace/Reactor.h" #include "log_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; /** @@ -398,6 +400,8 @@ protected: static const ACE_Time_Value log_flush_interval_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TLS_LOG_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 45d006584a2..97f1a9803f1 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -6,19 +6,21 @@ ACE_RCSID (Log, NotifyLogConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log) : log_ (log) { - // No-Op. } TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void) { - // No-Op. } void -TAO_Notify_LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) +TAO_Notify_LogConsumer::connect ( + CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::PushConsumer_var objref = @@ -137,6 +139,6 @@ TAO_Notify_LogConsumer::disconnect_push_consumer CORBA::SystemException )) { - // No-Op. } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index 7035fc44e3a..4f92f0b83f5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -34,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_NotifyLog_i; class TAO_NotifyLogFactory_i; @@ -105,6 +107,8 @@ protected: TAO_NotifyLog_i *log_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index a0156b4153b..32af058cd1c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -7,9 +7,10 @@ ACE_RCSID (Log, NotifyLogFactory_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void) { - // No-Op. } TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf) @@ -457,3 +458,5 @@ TAO_NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) { consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index 6d75d41f3bc..ca31bba2364 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -33,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_NotifyLog_i; class TAO_NotifyLogNotification; @@ -269,6 +271,8 @@ protected: CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 53434e73a9b..1a3762a4d51 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -7,8 +7,13 @@ ACE_RCSID (Log, NotifyLogNotification, "$Id$") -TAO_NotifyLogNotification::TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec) -: TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_NotifyLogNotification::TAO_NotifyLogNotification ( + CosNotifyChannelAdmin::EventChannel_ptr ec) + : TAO_LogNotification (), + event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { ACE_DECLARE_NEW_CORBA_ENV; @@ -79,3 +84,5 @@ TAO_NotifyLogNotification::disconnect_push_supplier this->proxy_consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index ce9c7dcfc7e..aac99386d03 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -8,10 +8,7 @@ * * Methods to enable log-generated events. * - * * @author D A Hanvey <d.hanvey@qub.ac.uk> - * - * */ //============================================================================= @@ -37,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_NotifyLogNotification * @@ -99,6 +98,8 @@ private: CosNotifyChannelAdmin::EventChannel_var event_channel_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index a515cac8e58..f89d8acf1c0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -9,6 +9,8 @@ ACE_RCSID (Log, #define CA_FILTER "threshold > 10" #define TCL_GRAMMAR "TCL" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, TAO_LogMgr_i &logmgr_i, @@ -187,13 +189,12 @@ TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) +TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */ + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - ACE_UNUSED_ARG (filter); - ACE_THROW (CORBA::NO_IMPLEMENT ()); //TODO: need to add impl @@ -324,30 +325,25 @@ TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL) +TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */ + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CosNotification::UnsupportedQoS, CORBA::SystemException )) { - ACE_UNUSED_ARG (qos); - ACE_THROW (CORBA::NO_IMPLEMENT ()); //TODO: need to add later } void -TAO_NotifyLog_i::validate_qos (const CosNotification::QoSProperties& required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )) +TAO_NotifyLog_i::validate_qos ( + const CosNotification::QoSProperties& /* required_qos */, + CosNotification::NamedPropertyRangeSeq_out /* available_qos */ + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CosNotification::UnsupportedQoS, + CORBA::SystemException)) { - ACE_UNUSED_ARG (required_qos); - - ACE_UNUSED_ARG (available_qos); - ACE_THROW (CORBA::NO_IMPLEMENT ()); //TODO: need to add later @@ -372,3 +368,5 @@ TAO_NotifyLog_i::for_suppliers ( { return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index e75de7ef71e..a0d41ff67c7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -36,6 +36,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_NotifyLog_i; class TAO_NotifyLogFactory_i; @@ -233,6 +235,8 @@ private: PortableServer::POA_var poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index 857d07740f2..1e8b7d5b188 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Log, PersistStore, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size, CORBA::ULong max_rec_list_len) : maxid_ (0), @@ -19,12 +21,10 @@ TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size, num_records_ (0), max_rec_list_len_ (max_rec_list_len) { - // No-Op. } TAO_PersistStore::~TAO_PersistStore (void) { - // No-Op. } int @@ -225,3 +225,5 @@ TAO_PersistStore::get_percentage_full (void) return static_cast<unsigned short> ((100U * this->current_size_ / this->max_size_)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index ef769afb0df..45cfbf6f3c5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -30,6 +30,8 @@ #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + struct PersistentData { DsLogAdmin::RecordId id; @@ -120,5 +122,7 @@ class TAO_Log_Serv_Export TAO_PersistStore ACE_Mutex write_lock_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_PERSIST_STORE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 018bc2388e4..08a2cfd036e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -17,16 +17,15 @@ ACE_RCSID (Log, RTEventLogConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log) -: log_ (log) + : log_ (log) { - // No-Op. } TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void) { - // No-Op. } void @@ -62,6 +61,8 @@ void TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier ( + ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 3e8f5ab382f..a29303d43d8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -9,7 +9,6 @@ * The RTEventLogConsumer connects to the RTEventLog and logs the events * that are pushed to the RTEventLog. * - * * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -38,6 +37,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_RTEventLog_i; class TAO_RTEventLogFactory_i; @@ -83,6 +85,7 @@ private: TAO_RTEventLog_i *log_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index fe2ef5b3dfb..eb4a1c91e2b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -21,14 +21,15 @@ ACE_RCSID (Log, RTEventLogFactory_i, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void) { - // No-Op. } TAO_RTEventLogFactory_i::~TAO_RTEventLogFactory_i() { - // No-Op. } int @@ -236,3 +237,5 @@ TAO_RTEventLogFactory_i::obtain_push_supplier ( { return consumer_admin_->obtain_push_supplier(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index ac5fd564578..4c4c73f8660 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -8,7 +8,6 @@ * * Implements the Factory for NotifyLog Objects. * - * * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -37,6 +36,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTEventLog_i; class TAO_RTEventLogNotification; @@ -130,6 +131,8 @@ protected: RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 27bae02833b..d3ceeb987e8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -22,9 +22,12 @@ ACE_RCSID (Log, RTEventLogNotification, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RTEventLogNotification::TAO_RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr ec) -: TAO_LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) +TAO_RTEventLogNotification::TAO_RTEventLogNotification ( + RtecEventChannelAdmin::EventChannel_ptr ec) + : TAO_LogNotification (), + event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { ACE_DECLARE_NEW_CORBA_ENV; @@ -84,4 +87,4 @@ TAO_RTEventLogNotification::send_notification (const CORBA::Any& any) consumer_->push(event); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index 5ba126799b0..b5306970e26 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -8,10 +8,7 @@ * * Methods to enable log-generated events. * - * * @author D A Hanvey <d.hanvey@qub.ac.uk> - * - * */ //============================================================================= @@ -40,6 +37,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RTEventLogNotification * @@ -84,6 +83,8 @@ private: RtecEventChannelAdmin::ProxyPushConsumer_var consumer_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 2e1ecb377a2..d4ef5923221 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -17,6 +17,7 @@ ACE_RCSID (Log, RTEventLog_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -144,7 +145,8 @@ TAO_RTEventLog_i::append_observer ( RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER); + return this->observer_strategy_->append_observer (observer + ACE_ENV_ARG_PARAMETER); } void @@ -158,3 +160,5 @@ TAO_RTEventLog_i::remove_observer ( { this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index c52cadac6ca..9576834334b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -38,6 +38,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_LogMgr_i; class TAO_RTEventLog_i; class TAO_RTEventLogFactory_i; @@ -127,6 +129,8 @@ public: PortableServer::POA_var poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index fb5abdd6f0d..b9a0c0b38a3 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -1213,18 +1213,14 @@ libTAO_PortableGroup_la_SOURCES = \ PortableGroup/MIOP.cpp \ PortableGroup/PG_Default_Property_Validator.cpp \ PortableGroup/PG_FactoryRegistry.cpp \ - PortableGroup/PG_Factory_Map.cpp \ - PortableGroup/PG_Factory_Set.cpp \ PortableGroup/PG_GenericFactory.cpp \ PortableGroup/PG_Group_Factory.cpp \ PortableGroup/PG_Group_Guard.cpp \ PortableGroup/PG_Location_Equal_To.cpp \ PortableGroup/PG_Location_Hash.cpp \ - PortableGroup/PG_Location_Map.cpp \ PortableGroup/PG_MemberInfo.cpp \ PortableGroup/PG_Null_Property_Validator.cpp \ PortableGroup/PG_ObjectGroupManager.cpp \ - PortableGroup/PG_ObjectGroup_Map.cpp \ PortableGroup/PG_Object_Adapter_Factory.cpp \ PortableGroup/PG_Object_Group.cpp \ PortableGroup/PG_Object_Group_Manipulator.cpp \ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h index f1ad017f20d..c9dbf14fd0d 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h @@ -23,12 +23,15 @@ #include "Metrics_FrameManager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX> TAO_METRICS_FRAME_MGR_TYPE; typedef ACE_Singleton<TAO_METRICS_FRAME_MGR_TYPE, ACE_SYNCH_MUTEX> TAO_METRICS_FRAME_MGR_SINGLETON; +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* METRICS_FRAME_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h index df418913117..a4ca25b7046 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h @@ -32,6 +32,8 @@ #include "Metrics_LocalCache_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Metrics_LocalCache<ACE_SYNCH_MUTEX, ACE_New_Allocator> TAO_METRICS_CACHE_TYPE; @@ -97,6 +99,9 @@ PROBE_TYPE, \ METRICS_LOGGER_REF); \ } } while (0) + +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Metrics_LocalCache.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp index a73236d2652..68fedf4d825 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp @@ -9,8 +9,10 @@ #include <cacheLib.h> #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////////////////////// -// Class TAO_Metrics_LocalTimeprobe //g +// Class TAO_Metrics_LocalTimeprobe // ////////////////////////////////////// // Default constructor. @@ -481,8 +483,6 @@ flush_TAO_Metrics_LocalCache () #endif } -#if !defined (__ACE_INLINE__) -#include "Metrics_LocalCache_T.i" -#endif /* __ACE_INLINE__ */ +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* METRICS_LOCAL_CACHE_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h index db031b72f32..79502ec49d9 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef METRICS_LOCAL_CACHE_T_H @@ -18,6 +20,8 @@ #include "orbsvcs/MetricsC.h" #include "orbsvcs/Metrics/Metrics_Utils.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined (ACE_HAS_METRICS_BASE_POINTERS) typedef ACE_Based_Pointer<char> ACE_METRICS_STRING_TYPE; typedef ACE_Based_Pointer<Metrics::TimeprobeParameter_Set> ACE_METRICS_PARAMETER_SET_TYPE; @@ -312,6 +316,8 @@ public: // Flush the TAO metrics local cache into shared memory. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Metrics_LocalCache_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ @@ -320,8 +326,4 @@ public: #pragma implementation ("Metrics_LocalCache_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#if defined (__ACE_INLINE__) -#include "Metrics_LocalCache_T.i" -#endif /* __ACE_INLINE__ */ - #endif /* METRICS_LOCAL_CACHE_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp index dd7f2de0b01..7b2db145322 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp @@ -10,8 +10,9 @@ ACE_RCSID(Metrics_Logger, Metrics_Logger, "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) -const int OPEN_CLOSE_BANNER_CYCLE = 4; +static const int OPEN_CLOSE_BANNER_CYCLE = 4; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////////////// // class TAO_Metrics_Logger // @@ -864,5 +865,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h index 3a1c3c0d0de..96bb3852712 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef METRICS_LOGGER_H @@ -41,6 +43,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Metrics_Export TAO_Metrics_Logger_Data { // = TITLE @@ -212,6 +216,8 @@ TAO_METRICS_LOGGER_REF_SINGLETON; typedef ACE_Singleton<TAO_Metrics_Logger, ACE_SYNCH_MUTEX> TAO_METRICS_LOGGER_SINGLETON; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index 2d18b1678e1..32feb82dd2f 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef METRICS_UPCALL_MONITOR_H @@ -26,6 +28,8 @@ #include "Metrics_FrameManager.h" #include "Metrics_Utils.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Metrics_Export TAO_Metrics_UpcallMonitor : public POA_Metrics::QoSMonitor { @@ -249,6 +253,8 @@ typedef TAO_METRICS_MONITOR_ADAPTER_TYPE TAO_METRICS_MONITOR_ADAPTER; typedef TAO_METRICS_MONITOR_SINGLETON_TYPE TAO_METRICS_MONITOR_SINGLETON; #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i index 41c3b8ff649..9b028ba293b 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ // @METRICS@ @@ -13,6 +15,7 @@ # define METRICS_USES_OP_CANCELLATION # endif /* ! METRICS_USES_OP_CANCELLATION */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////////////// // Class TAO_Metrics_UpcallMonitor // @@ -373,4 +376,6 @@ TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS ( logger->log_aggregate_QoS (qos_set, interval); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* METRICS_UPCALL_MONITOR_I */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp index 7065e9bea6d..227412fe3c7 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp @@ -9,8 +9,9 @@ #include "Metrics_UpcallMonitor_T.i" #endif /* __ACE_INLINE__ */ -// Virtual destructor: destroy actual consumer if we own it. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// Virtual destructor: destroy actual consumer if we own it. template <class ACE_LOCK, class ALLOCATOR> TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>:: ~TAO_Metrics_UpcallMonitorAdapter () @@ -21,5 +22,7 @@ TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>:: } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* METRICS_UPCALL_MONITOR_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h index 10bccb4f8e1..8bdb52acf44 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef METRICS_UPCALL_MONITOR_T_H @@ -22,6 +24,9 @@ #include "orbsvcs/Metrics/Metrics_UpcallMonitor.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class ACE_LOCK, class ALLOCATOR> class TAO_Metrics_UpcallMonitorAdapter : public RtecEventComm::PushConsumer @@ -141,6 +146,12 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined (__ACE_INLINE__) +#include "Metrics_UpcallMonitor_T.i" +#endif /* __ACE_INLINE__ */ + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Metrics_UpcallMonitor_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ @@ -149,9 +160,5 @@ protected: #pragma implementation ("Metrics_UpcallMonitor_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#if defined (__ACE_INLINE__) -#include "Metrics_UpcallMonitor_T.i" -#endif /* __ACE_INLINE__ */ - #endif /* METRICS_UPCALL_MONITOR_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i index 33dd8d54bfb..3efda520d6f 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i @@ -16,6 +16,8 @@ # endif /* ! METRICS_USES_OP_CANCELLATION */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //////////////////////////////////////////// // class TAO_Metrics_UpcallMonitorAdapter // //////////////////////////////////////////// @@ -256,4 +258,6 @@ TAO_Metrics_ReportingUpcallMonitorAdapter ( this->logger_); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* METRICS_UPCALL_MONITOR_T_I */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp index e4b4dab16bf..2d7119cbc70 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp @@ -12,8 +12,7 @@ #include "Metrics_Utils.h" #include "Metrics_LocalCache.h" - - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////// // Class TAO_Metrics_Utils // @@ -521,7 +520,7 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles () #endif /* TAO_USES_REPORTING_METRICS */ } - +TAO_END_VERSIONED_NAMESPACE_DECL #if !defined (__ACE_INLINE__) #include "Metrics_Utils.i" diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h index 7b86fb1c94d..c1679582ea1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef METRICS_UTILS_H @@ -26,6 +28,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Metrics_Export TAO_Metrics_Utils { // = TITLE @@ -171,8 +175,7 @@ PROBE_TYPE, \ METRICS_LOGGER_REF); \ } } while (0) - - +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "Metrics_Utils.i" diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i index e66bd0c7d62..04a77bddb52 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i @@ -1,8 +1,12 @@ +// -*- C++ -*- +// // $Id$ #ifndef METRICS_UTILS_I #define METRICS_UTILS_I +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ///////////////////////////// // Class TAO_Metrics_Utils // ///////////////////////////// @@ -30,4 +34,6 @@ TAO_Metrics_Utils::timeoutEvent (RtecScheduler::handle_t handle) TAO_Metrics_Utils::timeoutEvent_ = handle; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* METRICS_UTILS_I */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index 951021dea65..58f7f949abd 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -9,11 +9,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class ITERATOR, class TABLE_ENTRY> -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context, - ITERATOR *hash_iter, - PortableServer::POA_ptr poa, - TAO_SYNCH_RECURSIVE_MUTEX &lock) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator ( + TAO_Hash_Naming_Context *context, + ITERATOR *hash_iter, + PortableServer::POA_ptr poa, + TAO_SYNCH_RECURSIVE_MUTEX &lock) : destroyed_ (0), context_ (context), hash_iter_ (hash_iter), @@ -36,14 +39,16 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void) // Return the Default POA of this Servant template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA ( + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b - ACE_ENV_ARG_DECL) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one ( + CosNaming::Binding_out b + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosNaming::Binding *binding; @@ -99,9 +104,10 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b } template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many, - CosNaming::BindingList_out bl - ACE_ENV_ARG_DECL) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n ( + CORBA::ULong how_many, + CosNaming::BindingList_out bl + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // We perform an allocation before obtaining the lock so that an out @@ -194,8 +200,9 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL) } template <class ITERATOR, class TABLE_ENTRY> int -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (TABLE_ENTRY *hash_entry, - CosNaming::Binding &b) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding ( + TABLE_ENTRY *hash_entry, + CosNaming::Binding &b) { b.binding_type = hash_entry->int_id_.type_; b.binding_name.length (1); @@ -220,4 +227,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (TABLE_ENTRY *has return 1; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_BINDINGS_ITERATOR_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 8247c6db8d2..62f0e6f904b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Bindings_Iterator_T.h @@ -16,6 +17,9 @@ #include "Hash_Naming_Context.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Bindings_Iterator * @@ -127,6 +131,8 @@ private: PortableServer::POA_var poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Bindings_Iterator_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp index 965839c7a93..152ad33bdba 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp @@ -17,6 +17,9 @@ ACE_RCSID(Naming, Entries, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IntId::TAO_IntId (void) : type_ (CosNaming::nobject) { @@ -120,3 +123,5 @@ TAO_ExtId::hash (void) const return temp.hash (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 26f4d5703b3..2e1bd06242a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ #include "orbsvcs/CosNamingC.h" #include "naming_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_IntId * @@ -131,5 +133,7 @@ public: const char * kind (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ENTRIES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp index fa5368191bc..bdee7c2b85e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp @@ -10,6 +10,8 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_NS_FlatFileStream::TAO_NS_FlatFileStream (const ACE_CString & file, const char * mode) : fl_ (0) @@ -344,9 +346,9 @@ TAO_NS_FlatFileStream::operator >>( } -TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream( - const ACE_CString & file, - const ACE_TCHAR * mode) +TAO_Storable_Base * +TAO_NS_FlatFileFactory::create_stream (const ACE_CString & file, + const ACE_TCHAR * mode) { ACE_TRACE("TAO_NS_FlatFileFactory::create_stream"); TAO_Storable_Base *stream = 0; @@ -356,3 +358,5 @@ TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream( 0); return stream; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h index 242a49d531d..ccb2fcf4d3d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Flat_File_Persistence.h @@ -15,6 +16,8 @@ #include "Storable.h" #include "ace/OS_NS_stdio.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //------------------------------------------------------------------------ // The Flat File concrete classes //------------------------------------------------------------------------ @@ -87,5 +90,6 @@ public: const ACE_TCHAR * mode); }; +TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 6caa0472771..bee924599a6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -22,6 +22,8 @@ ACE_RCSID (Naming, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ------------------------------------------------- TAO_Bindings_Map::~TAO_Bindings_Map (void) @@ -686,3 +688,5 @@ TAO_Hash_Naming_Context::interface (void) { return this->interface_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index d3853190a0c..240435cc5a5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -35,6 +35,8 @@ #undef interface #endif // interface +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Bindings_Map * @@ -271,6 +273,8 @@ protected: ACE_CString poa_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_HASH_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index e45aacd76e1..49f700db6f0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Naming, Naming_Client, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CosNaming::NamingContext_ptr TAO_Naming_Client::operator -> (void) const { @@ -61,3 +63,5 @@ TAO_Naming_Client::~TAO_Naming_Client (void) { // Do nothing } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h index 9f829de7de0..56b48d7f37d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h @@ -24,6 +24,8 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/naming_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Naming_Client * @@ -70,5 +72,7 @@ protected: CosNaming::NamingContext_var naming_context_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NAMING_CLIENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 5b06cdc83f9..5350dc555cd 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -18,6 +18,8 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl) : impl_ (impl) { @@ -533,3 +535,5 @@ TAO_Naming_Context::resolve_str (const char * n TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 1c532b8f5d7..938adb3ef02 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -20,6 +20,8 @@ #include "naming_serv_export.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Naming_Context_Impl; // This is to remove "inherits via dominance" warnings from MSVC. @@ -413,6 +415,8 @@ public: virtual PortableServer::POA_ptr _default_POA (void) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NAMING_CONTEXT_INTERFACE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 2a098d198c8..69abd47a19e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -19,6 +19,9 @@ ACE_RCSID (Naming, Naming_Loader, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Naming_Loader::TAO_Naming_Loader (void) { // Constructor @@ -90,4 +93,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index cc19c7a78a2..9f9543ce3f9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ +// -*- C++ -*- // $Id$ @@ -26,6 +26,8 @@ #include "orbsvcs/Naming/Naming_Server.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader { public: @@ -62,6 +64,8 @@ private: TAO_Naming_Loader &operator = (const TAO_Naming_Loader &); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_Naming_Serv, TAO_Naming_Loader) #endif /* TAO_NAMING_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 16dfc411bcb..f70720e38cb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -29,6 +29,8 @@ ACE_RCSID (Naming, Naming_Server, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Naming_Server::TAO_Naming_Server (void) : naming_context_ (), ior_multicast_ (0), @@ -762,3 +764,5 @@ TAO_Naming_Server::~TAO_Naming_Server (void) delete this->servant_activator_; #endif /* TAO_HAS_MINIMUM_POA */ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index 9777c7244d5..a7cf2d0b80b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -11,7 +11,7 @@ * * @author Nagarajan Surendran (naga@cs.wustl.edu) * @author Matt Braun <mjb2@cs.wustl.edu> - * @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>. + * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>. */ //============================================================================= @@ -26,6 +26,8 @@ #include "Naming_Context_Interface.h" #include "nsconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward decl; class TAO_Persistent_Context_Index; class TAO_Storable_Naming_Context_Activator; @@ -231,5 +233,7 @@ protected: int use_round_trip_timeout_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NAMING_SERVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index eec01316dc3..35a4737b125 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -13,8 +13,8 @@ // ============================================================================ -#ifndef NS_CONTAINER_C -#define NS_CONTAINER_C +#ifndef NS_CONTAINER_CPP +#define NS_CONTAINER_CPP #include "ace/Malloc_Base.h" @@ -24,6 +24,8 @@ #include "Naming_Service_Container.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node) # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) @@ -367,7 +369,6 @@ ACE_Unbounded_List_Iterator<T>::operator!= (const ACE_Unbounded_List_Iterator<T> //ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator!="); return (this->set_ != rhs.set_ || this->current_ != rhs.current_); } -/* -*- C++ -*- */ // --- @@ -385,5 +386,7 @@ ACE_Unbounded_List<T>::is_full (void) const return 0; // We should implement a "node of last resort for this..." } +TAO_END_VERSIONED_NAMESPACE_DECL + -#endif /* NS_CONTAINERS_T_C */ +#endif /* NS_CONTAINERS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index 7bd568a592a..469caa06276 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Naming_Service_Container.h @@ -31,6 +32,7 @@ class ACE_Allocator; template <class T> class ACE_Unbounded_List; template <class T> class ACE_Unbounded_List_Iterator; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_NS_Node @@ -221,6 +223,7 @@ private: ACE_Allocator *allocator_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Naming_Service_Container.cpp" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index c2563037d21..fae171bd18f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -8,6 +8,8 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Persistent_Context_Index::unbind (const char *poa_id) { @@ -304,3 +306,5 @@ TAO_Persistent_Context_Index::create_index_helper (void *buffer) this->index_ = new (buffer) CONTEXT_INDEX (this->allocator_); return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index a524d5e39ac..da12b2b1559 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "ace/Malloc_T.h" #include "ace/MMAP_Memory_Pool.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Persistent_Context_Index * @@ -163,5 +165,7 @@ private: CosNaming::NamingContext_var root_context_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp index 355ccb73261..c687e15deb7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp @@ -16,6 +16,8 @@ #include "Persistent_Entries.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Persistent_IntId::TAO_Persistent_IntId (void) : ref_ (0), type_ (CosNaming::nobject) @@ -202,3 +204,5 @@ TAO_Persistent_Index_ExtId::hash (void) const ACE_CString temp (poa_id_); return temp.hash (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index 59a65b3dd85..1dbbd10848e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Persistent_IntId * @@ -225,5 +227,7 @@ public: const char * poa_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PERSISTENT_ENTRIES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 4a0e122ff90..0aea6d2beaa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -19,6 +19,7 @@ ACE_RCSID (Naming, Persistent_Naming_Context, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_Persistent_Bindings_Map::unbind (const char *id, @@ -536,3 +537,5 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index d3baab97b89..b499ddf5161 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Persistent_Naming_Context.h @@ -18,6 +19,8 @@ #include "Persistent_Entries.h" #include "naming_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Persistent_Bindings_Map * @@ -29,7 +32,8 @@ * from persistent storage) to make bindings persistent and * supports TAO_Bindings_Map interface. Used by TAO_Persistent_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map + : public TAO_Bindings_Map { public: @@ -263,5 +267,7 @@ protected: TAO_Persistent_Context_Index *index_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PERSISTENT_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.h b/TAO/orbsvcs/orbsvcs/Naming/Storable.h index 4e82d203852..48248e02e1d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.h @@ -1,22 +1,34 @@ +// -*- C++ -*- + //============================================================================= /** * @file Storable.h * * $Id$ * - * @author Bruce Trask <trask_b@ociweb.com> Chanaka Liyanaarachchi <chanaka@ociweb.com> + * @author Bruce Trask <trask_b@ociweb.com> + * @author Chanaka Liyanaarachchi <chanaka@ociweb.com> */ //============================================================================= -#ifndef STORABLE_H -#define STORABLE_H +#ifndef TAO_NAMING_STORABLE_H +#define TAO_NAMING_STORABLE_H + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/SString.h" -const int szInt = sizeof(int); -const int szChar = sizeof(char); -const int szBool = sizeof(int); +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +static const int szInt = sizeof(int); +static const int szChar = sizeof(char); +static const int szBool = sizeof(int); class TAO_NS_Persistence_Header { @@ -144,8 +156,10 @@ public: const ACE_TCHAR * mode) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Storable.inl" #endif /* __ACE_INLINE_ */ -#endif +#endif /* TAO_NAMING_STORABLE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl index c6eff092b53..50a149a9c0c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ // ============================================================================ // @@ -13,6 +15,8 @@ // // ============================================================================ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_NS_Persistence_Header::size (unsigned int size) { @@ -162,3 +166,5 @@ TAO_Storable_Base::fail (void) const { return (this->state_ & failbit); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 9b8c8152000..be50bc6eb2d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -16,16 +16,18 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdio.h" +ACE_RCSID (Naming, + Storable_Naming_Context, + "$Id$") + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char * TAO_Storable_Naming_Context::root_name_; ACE_UINT32 TAO_Storable_Naming_Context::gcounter_; ACE_Auto_Ptr<TAO_Storable_Base> TAO_Storable_Naming_Context::gfl_; int TAO_Storable_Naming_Context::redundant_; -ACE_RCSID (Naming, - Storable_Naming_Context, - "$Id$") - TAO_Storable_IntId::TAO_Storable_IntId (void) : ref_ (CORBA::string_dup ("")), type_ (CosNaming::nobject) @@ -1539,3 +1541,5 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( return result._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index a8d6c62f634..b4d9b6a4a51 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Naming_Serv_Export TAO_Storable_IntId { public: @@ -465,6 +467,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_STORABLE_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index 5402c1faed9..cb644d3f20e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -20,11 +20,13 @@ #include "Storable.h" #include "ace/Auto_Ptr.h" -TAO_Storable_Naming_Context_Activator:: -TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb, - TAO_Naming_Service_Persistence_Factory *factory, - const ACE_TCHAR *persistence_directory, - size_t context_size) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Storable_Naming_Context_Activator::TAO_Storable_Naming_Context_Activator ( + CORBA::ORB_ptr orb, + TAO_Naming_Service_Persistence_Factory *factory, + const ACE_TCHAR *persistence_directory, + size_t context_size) : orb_(orb), factory_(factory), persistence_directory_(persistence_directory), @@ -38,9 +40,10 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator () } PortableServer::Servant -TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) +TAO_Storable_Naming_Context_Activator::incarnate ( + const PortableServer::ObjectId &oid, + PortableServer::POA_ptr poa + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -103,12 +106,13 @@ TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId } void -TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::ObjectId &/*oid*/, - PortableServer::POA_ptr /*adapter*/, - PortableServer::Servant servant, - CORBA::Boolean /*cleanup_in_progress*/, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Storable_Naming_Context_Activator::etherealize ( + const PortableServer::ObjectId &/*oid*/, + PortableServer::POA_ptr /*adapter*/, + PortableServer::Servant servant, + CORBA::Boolean /*cleanup_in_progress*/, + CORBA::Boolean remaining_activations + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!remaining_activations) { @@ -116,4 +120,6 @@ TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::Object } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index e2bce0b2951..c3cb664f6fa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -26,6 +27,8 @@ #include "naming_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Naming_Service_Persistence_Factory; /** @@ -80,6 +83,8 @@ private: size_t context_size_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 8a81829332d..8d479154e75 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -19,6 +19,8 @@ ACE_RCSID(Naming, Transient_Naming_Context, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Transient_Bindings_Map::unbind (const char *id, const char *kind) @@ -338,3 +340,5 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index 94ba088fb30..adceb9f3e44 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Transient_Naming_Context.h @@ -22,6 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Transient_Bindings_Map * @@ -194,5 +198,7 @@ protected: TAO_Transient_Bindings_Map *transient_context_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TRANSIENT_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 8cf67d318c6..9195f4c52fd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -29,6 +29,8 @@ ACE_RCSID (Notify, # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Admin::TAO_Notify_Admin () : ec_ (0) , filter_operator_ (CosNotifyChannelAdmin::OR_OP) @@ -205,3 +207,4 @@ TAO_Notify_Admin::reconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index 3af6e864fae..ecad878497e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -25,6 +25,7 @@ #include "Topology_Object.h" #include "EventChannel.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Proxy; template <class TYPE> class TAO_Notify_Container_T; @@ -114,6 +115,8 @@ private: ACE_Auto_Ptr< TAO_Notify_Proxy_Container > proxy_container_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Admin.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl index eef513ea103..d7cb523081e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_EventChannel * TAO_Notify_Admin::event_channel () const @@ -46,3 +50,5 @@ TAO_Notify_Admin::proxy_container() ACE_ASSERT( proxy_container_.get() != 0 ); return *proxy_container_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index afb3a1cb63a..97315246fc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Notify, #include "orbsvcs/CosNotificationC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) , max_consumers_ (CosNotification::MaxConsumers, 0) @@ -88,3 +90,5 @@ TAO_Notify_AdminProperties::queue_full (void) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index 0361cfc5d46..5f040b4cb85 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -31,6 +31,8 @@ #include "ace/Bound_Ptr.h" #include "ace/Condition_Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_AdminProperties * @@ -120,6 +122,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "AdminProperties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl index e88a34cec6a..bc93ae89184 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const TAO_Notify_Property_Long& TAO_Notify_AdminProperties::max_global_queue_length (void) const { @@ -77,3 +81,5 @@ TAO_Notify_AdminProperties::suppliers (void) { return this->suppliers_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 2f09a9836a1..b9db8fb3766 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -14,6 +14,8 @@ ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_EventType TAO_Notify_AnyEvent_No_Copy::event_type_; TAO_Notify_AnyEvent_No_Copy::TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event) @@ -122,7 +124,7 @@ TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const } -/*****************************************************************************************************/ +/*****************************************************************************/ TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event) : TAO_Notify_AnyEvent_No_Copy (event) @@ -134,3 +136,5 @@ TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event) TAO_Notify_AnyEvent::~TAO_Notify_AnyEvent () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index a66d994474c..46e35413d6f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -25,6 +25,9 @@ #include "orbsvcs/CosNotificationC.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Consumer; class TAO_Notify_AnyEvent; /** @@ -88,7 +91,7 @@ protected: static TAO_Notify_EventType event_type_; }; -/*****************************************************************************************************/ +/****************************************************************************/ /** * @class TAO_Notify_AnyEvent @@ -110,6 +113,8 @@ protected: CORBA::Any any_copy_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_ANYEVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index a68926d13da..3a7dee91941 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$") #include "AnyEvent.h" #include "PushSupplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void) { } @@ -84,3 +86,5 @@ TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const { return "ec_proxy_push_consumer"; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index 47dfb5c400f..ef6b0bd8263 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_CosEC_ProxyPushConsumer * @@ -73,6 +75,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index b6bc7eaffcc..008de7aa779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -7,6 +7,8 @@ ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$") #include "tao/debug.h" #include "PushConsumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void) { } @@ -59,3 +61,5 @@ TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const { return "ec_proxy_push_supplier"; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index a216d9f9527..674448e07ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; @@ -76,6 +78,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 4101bd52b2f..2fdaff93209 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$") #include "AnyEvent.h" #include "PushSupplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void) { } @@ -125,3 +127,4 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs) } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 1766a878f1a..d2c07a5a15a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -28,6 +28,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_ProxyPushConsumer * @@ -84,6 +86,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index 10180736830..dbb52f90dc8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$") #include "PushConsumer.h" #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void) { } @@ -100,3 +102,5 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs) ACE_ENDTRY; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index 82dd07722ad..7c0f129191c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>; @@ -85,6 +87,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index a912b7f5706..1b7340857ec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Notify, #include "../Event.h" #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy) :TAO_Notify_Consumer (proxy) { @@ -104,3 +106,5 @@ TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consu ACE_CHECK; this->schedule_timer(false); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index b159ad6e702..825c4ae4312 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -22,6 +22,8 @@ #include "orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_PushConsumer * @@ -71,5 +73,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_PUSHCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp index a554c4cc2cc..cf570b7ec44 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp @@ -5,6 +5,8 @@ ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$") #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_PushSupplier::TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy) :TAO_Notify_Supplier (proxy) { @@ -59,3 +61,5 @@ TAO_Notify_PushSupplier::get_ior (ACE_CString & iorstr) const ACE_ENDTRY; return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 9c5cf56d9bc..86dcee230fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -23,6 +23,8 @@ #include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxyConsumer; /** @@ -56,5 +58,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_PUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index b63c36326cc..96f213d97d4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -2,6 +2,8 @@ #include "Bit_Vector.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -108,3 +110,5 @@ Bit_Vector::find_first_bit_of(const size_t location, bool set) } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index b9f090dac6d..0dde1374969 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -15,17 +15,20 @@ #ifndef BIT_VECTOR_H #define BIT_VECTOR_H #include /**/ "ace/pre.h" -#include /**/ "ace/config-all.h" + +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "notify_serv_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/Vector_T.h" #include "ace/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -72,5 +75,7 @@ private: } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* BIT_VECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 500df2b2925..d6f53a24bb5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -17,6 +17,8 @@ ACE_RCSID (Notify, Buffering_Strategy, "$Id$") #include "ace/Message_Queue.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy ( TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties::Ptr& admin_properties) @@ -257,3 +259,5 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable& met return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index dce50b6cc63..61bba340326 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -29,6 +29,8 @@ #include "Property_T.h" #include "AdminProperties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Method_Request_Queueable; class TAO_Notify_QoSProperties; @@ -113,6 +115,8 @@ private: bool shutdown_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_BUFFERING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index d6b4fdb7318..88800ed0d99 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -36,6 +36,8 @@ ACE_RCSID (Notify, #include "ETCL_FilterFactory.h" #include "Container_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class PROXY_IMPL, class PROXY, class PROXY_PTR, @@ -586,3 +588,5 @@ TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const // No lane support ACE_THROW (CORBA::NO_IMPLEMENT ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index 737026ad329..577ed4a9481 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -28,6 +28,7 @@ #include "tao/PortableServer/PortableServer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_EventChannelFactory; class TAO_Notify_EventChannel; @@ -167,6 +168,8 @@ public: ); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_BUILDER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 2941ca9bbc9..f64e706191e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -27,6 +27,8 @@ ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$") static const int DEFAULT_RETRY_TIMEOUT = 10;//120; // Note : This should be a config param or qos setting +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy) : proxy_ (proxy) , is_suspended_ (0) @@ -572,3 +574,5 @@ TAO_Notify_Consumer::proxy_supplier (void) { return this->proxy_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 5f4e14af383..2e81b80f902 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -28,6 +28,9 @@ #include "Timer.h" #include "ace/Event_Handler.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxySupplier; class TAO_Notify_Proxy; class TAO_Notify_Method_Request_Event_Queueable; @@ -185,6 +188,8 @@ private: ACE_Auto_Ptr< Request_Queue > pending_events_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Consumer.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl index 83a73ad0019..c1dcd33bbe7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_Consumer::Request_Queue& TAO_Notify_Consumer::pending_events() @@ -19,3 +23,5 @@ TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->is_suspended_ = 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 37c29ecba36..41daf6f2033 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -27,6 +27,8 @@ ACE_RCSID (RT_Notify, # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy , CosNotifyChannelAdmin::ProxySupplier , CosNotifyChannelAdmin::ProxySupplier_ptr @@ -480,3 +482,5 @@ TAO_Notify_ConsumerAdmin::find_proxy_supplier ( } return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 73e3c31d381..85723b1fbd5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -30,6 +30,8 @@ class TAO_Notify_ProxySupplier; #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_ConsumerAdmin * @@ -240,6 +242,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h index 7a296f0d5b5..bd9fdc4ce47 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h @@ -24,17 +24,20 @@ #include "Event_Map_T.h" #include "ProxySupplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Consumer_Map * * @brief The Event Map for Consumers. * */ - typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_Notify_Consumer_Map; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_CONSUMER_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index f3dddbcffe4..e8a0fa4aea4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -16,9 +16,7 @@ #include "Container_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Notify, - Notify_Container_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class TYPE> TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void) @@ -62,4 +60,6 @@ TAO_Notify_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL) factory->create (this->collection_ ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_CONTAINER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 6713775b023..f94332d50b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -22,6 +22,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Container_T * @@ -61,6 +63,8 @@ protected: COLLECTION* collection_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Container_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl index d37030ab59d..ccf274aecbf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class TYPE> ACE_INLINE ACE_TYPENAME TAO_Notify_Container_T<TYPE>::COLLECTION* TAO_Notify_Container_T<TYPE>:: collection (void) { return this->collection_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp index 1479e18e46d..563113ea853 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp @@ -6,8 +6,12 @@ ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$") #include "CosNotify_Service.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void) { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service); ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h index 5dccf6d8084..1326a04c83e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h @@ -19,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_CosNotify_Initializer * @@ -34,5 +38,7 @@ public: static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_COSNOTIFY_INITIALIZER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 7bf71e8d379..8d759f2f8dd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -15,6 +15,8 @@ ACE_RCSID (Notify, TAO_CosNotify_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CosNotify_Service::TAO_CosNotify_Service (void) { } @@ -285,6 +287,8 @@ TAO_CosNotify_Service::builder (void) return *this->builder_; } +TAO_END_VERSIONED_NAMESPACE_DECL + /*********************************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index 6cade3ddca9..c250a51aa8f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -23,6 +23,8 @@ #include "Builder.h" #include "Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Properties; class TAO_Notify_EventChannelFactory; @@ -82,6 +84,8 @@ private: ACE_Auto_Ptr< TAO_Notify_Builder > builder_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service) ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index a027e130433..08d09a9f0e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -25,6 +25,9 @@ ACE_RCSID (Notify, #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Copy_On_Write.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class PROXY> class COW_Collection_Default_Factory { @@ -188,5 +191,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy CORBA::NO_MEMORY ()); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h index 9c6ac6f56a2..5eaf34e1620 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h @@ -21,6 +21,8 @@ #include "Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Default_Factory * @@ -91,6 +93,8 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index c5c2fcffa31..b70be939804 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -16,6 +16,8 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -98,3 +100,4 @@ Delivery_Request::routing_slip () const } // namespace +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index 413e245eac3..7665c0059f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -14,6 +14,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations of referenced classes class TAO_Notify_EventChannelFactory; @@ -124,6 +125,8 @@ private: } // namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Delivery_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl index 33b7f71b7bd..a34687b5c64 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl @@ -1,6 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -21,3 +24,4 @@ Delivery_Request::set_destination_id (IdVec & destination_id) } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 664af405c97..fac82881a5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$") #include "tao/debug.h" #include "Notify_Constraint_Visitors.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void) :constraint_expr_ids_ (0) { @@ -440,3 +442,5 @@ TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index a76ebdadfcf..8cc45776151 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -31,6 +31,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_ETCL_Filter * @@ -163,6 +165,8 @@ private: CONSTRAINT_EXPR_LIST constraint_expr_list_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 2f63881f0de..347c3730a59 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -6,6 +6,8 @@ ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$") #include "ETCL_Filter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) { } @@ -74,4 +76,6 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index f0a9f3a1b3d..74b400f2b13 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_ETCL_FilterFactory * @@ -79,6 +81,8 @@ protected: PortableServer::POA_var filter_poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 04e4e4ba7e8..927245c7b01 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -17,6 +17,8 @@ ACE_RCSID (Notify, #include "Any/AnyEvent.h" #include "Structured/StructuredEvent.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Event::TAO_Notify_Event (void) : priority_ (CosNotification::Priority, CosNotification::DefaultPriority) , timeout_ (CosNotification::Timeout) @@ -79,3 +81,4 @@ TAO_Notify_Event::unmarshal (TAO_InputCDR & cdr) return result; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 38a2e5e4fab..5c77f00ac69 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -31,6 +31,8 @@ #include "ace/Copy_Disabled.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Consumer; class TAO_Notify_EventType; @@ -126,6 +128,8 @@ private: bool is_on_heap_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Event.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl index 06203095422..36bdd57e0f5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const TAO_Notify_Property_Short& TAO_Notify_Event::priority (void) const { @@ -36,3 +40,4 @@ TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const return this->clone_.get(); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 74d4783a14a..ad28980d0c6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -24,6 +24,8 @@ ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin , CosNotifyChannelAdmin::ConsumerAdmin , CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -671,3 +673,4 @@ TAO_Notify_EventChannel::sa_container() return *sa_container_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index 086282ad2a5..cf3c50dfc3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -25,6 +25,7 @@ #include "Object.h" #include "EventChannelFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_ConsumerAdmin; class TAO_Notify_SupplierAdmin; @@ -243,6 +244,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 7358af79f29..6605083a3d1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -26,6 +26,8 @@ ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel , CosNotifyChannelAdmin::EventChannel , CosNotifyChannelAdmin::EventChannel_ptr @@ -537,3 +539,4 @@ TAO_Notify_EventChannelFactory::ec_container() return *ec_container_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index d2eabf13760..46932dac6ce 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -28,14 +28,16 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/NotifyExtS.h" -class TAO_Notify_EventChannel; -template <class TYPE> class TAO_Notify_Container_T; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ +class TAO_Notify_EventChannel; +template <class TYPE> class TAO_Notify_Container_T; + /** * @class TAO_Notify_EventChannelFactory * @@ -194,6 +196,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index 1b2e0a3a1ef..bf03df1d492 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -16,6 +16,8 @@ ACE_RCSID (Notify, TAO_Notify_EventType, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_EventType TAO_Notify_EventType::special (void) { @@ -174,3 +176,5 @@ TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index 2378fe6ba80..ce3ff095665 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -23,6 +23,9 @@ #include "orbsvcs/CosNotificationC.h" #include "Topology_Object.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_EventType * @@ -93,6 +96,8 @@ protected: // The hash value computed. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "EventType.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl index 1e0694b488e..95a07479666 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE u_long TAO_Notify_EventType::hash (void) const { @@ -11,3 +15,5 @@ TAO_Notify_EventType::native (void) const { return event_type_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 8a55665daa1..ac9e171dfb1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -11,6 +11,8 @@ ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void) { } @@ -311,3 +313,5 @@ TAO_Notify_EventTypeSeq::release (void) { delete this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index 1628fcada2b..e9f6aa50935 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -22,6 +22,8 @@ #include "EventType.h" #include "ace/Unbounded_Set.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_EventTypeSeq * @@ -80,5 +82,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENTTYPESEQ_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index faefec85e66..ba167275c67 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -14,7 +14,9 @@ ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$") #include "tao/debug.h" -/********************************************************************************/ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +/*****************************************************************************/ /** * @class TAO_Notify_ProxyConsumer_Update_Worker @@ -281,7 +283,7 @@ TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy AC proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER); } -/********************************************************************************/ +/*****************************************************************************/ TAO_Notify_ProxySupplier_Update_Worker::TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed) :added_ (added), removed_ (removed) @@ -294,4 +296,6 @@ TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy AC proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER); } -/********************************************************************************/ +/*****************************************************************************/ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index b6bfd97d181..20d6aad400d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -26,6 +26,8 @@ #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxySupplier; class TAO_Notify_ProxyConsumer; class TAO_Notify_EventTypeSeq; @@ -119,6 +121,8 @@ private: ACE_Auto_Ptr< TAO_Notify_Supplier_Map > supplier_map_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENT_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 089a32adca0..0f8f0384227 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -17,6 +17,8 @@ ACE_RCSID (Notify, #include "Properties.h" #include "Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class PROXY> TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void) : collection_ (0), count_ (0), usage_count_ (1) @@ -51,4 +53,6 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL --count_; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_EVENT_MAP_ENTRY_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index 869803a26b7..da977c98eb7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -26,6 +26,8 @@ #include "tao/ORB_Constants.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T; template <class PROXY> class TAO_ESF_Proxy_Collection; @@ -80,6 +82,8 @@ protected: ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> usage_count_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl index f01f9b0de6c..89da0eaed96 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class PROXY> ACE_INLINE ACE_TYPENAME TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION* TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) { @@ -23,3 +27,5 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt (void) { return --this->usage_count_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index c1dbe74c813..2864d140322 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_Notify_EVENT_MAP_T_C -#define TAO_Notify_EVENT_MAP_T_C +#ifndef TAO_Notify_EVENT_MAP_T_CPP +#define TAO_Notify_EVENT_MAP_T_CPP #include "Event_Map_T.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" @@ -13,7 +13,7 @@ #include "Event_Map_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Event_Map_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class PROXY, class ACE_LOCK> TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void) @@ -161,4 +161,6 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_ return 0; } -#endif /* TAO_Notify_EVENT_MAP_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_Notify_EVENT_MAP_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 27567a9c7a2..d7e2093f441 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -26,6 +26,8 @@ #include "Event_Map_Entry_T.h" #include "EventTypeSeq.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Event_Map_T * @@ -103,6 +105,8 @@ protected: TAO_Notify_EventTypeSeq event_types_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Event_Map_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl index c3368bddbbc..2b485893049 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class PROXY, class ACE_LOCK> ACE_INLINE TAO_Notify_Event_Map_Entry_T<PROXY>* TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED) { @@ -48,3 +52,5 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types (void) { return this->event_types_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp index b58c83c3b9f..afc13dd1d59 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp @@ -4,7 +4,10 @@ ACE_RCSID (Notify, Event_Persistence_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h index 2f36805859e..4466b34a59a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h @@ -15,13 +15,16 @@ #ifndef EVENT_PERSISTENCE_FACTORY_H #define EVENT_PERSISTENCE_FACTORY_H #include /**/ "ace/pre.h" -#include /**/ "ace/config-all.h" + +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "notify_serv_export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { @@ -45,5 +48,7 @@ namespace TAO_Notify }; } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* EVENT_PERSISTENCE_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index 3ff9990b326..f60de846ab7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -15,16 +15,18 @@ #ifndef EVENT_PERSISTENCE_STRATEGY_H #define EVENT_PERSISTENCE_STRATEGY_H #include /**/ "ace/pre.h" -#include /**/ "ace/config-all.h" + +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "notify_serv_export.h" - +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { class Event_Persistence_Factory; @@ -43,5 +45,7 @@ namespace TAO_Notify } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* EVENT_PERSISTENCE_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h index d2b7122a09d..cca5b551b16 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h @@ -18,10 +18,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/CORBA_macros.h" #include "ace/Service_Object.h" class ACE_Lock; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Object; class TAO_Notify_EventChannelFactory; class TAO_Notify_EventChannel; @@ -123,6 +127,8 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 0ff7ce87611..99c87cb9f66 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Notify, FilterAdmin, "$Id$") #include "Properties.h" #include "ace/Bound_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Implementation skeleton constructor TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void) { @@ -198,3 +200,5 @@ TAO_Notify_FilterAdmin::release (void) { delete this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index c1faf85d5eb..4734d0ef88c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** * @file FilterAdmin.h @@ -24,6 +25,8 @@ #include "notify_serv_export.h" #include "Topology_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_FilterAdmin * @@ -103,6 +106,8 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin TAO_Notify_ID_Factory filter_ids_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "FilterAdmin.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl index 52627546951..3b30256fbb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( @@ -31,3 +35,5 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index 689aacf4857..79ef939b85b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -24,6 +24,8 @@ #include "tao/PortableServer/PortableServer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_FilterFactory * @@ -40,6 +42,8 @@ public: ACE_ENV_ARG_DECL) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_FILTERFACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp index 43110f20672..f09f9dae458 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp @@ -9,7 +9,7 @@ #include "Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Find_Worker_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T (void) @@ -41,7 +41,8 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const ACE_CHECK_RETURN (INTERFACE::_nil ()); return INTERFACE::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_FIND_WORKER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index abc1533da56..1f658254903 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -24,6 +24,8 @@ #include "Container_T.h" #include "Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Find_Worker_T * @@ -57,6 +59,8 @@ protected: TYPE* result_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl index 04d4252383f..2b9af82e37a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl @@ -1,8 +1,14 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED) { if (type->id () == this->id_) this->result_ = type; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp index b8bec81f68c..00159c0fec7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void) : seed_ (0) { @@ -16,3 +18,5 @@ TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void) TAO_Notify_ID_Factory::~TAO_Notify_ID_Factory () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h index b9f0bd8aef5..2a8d9f0fa3c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h @@ -24,6 +24,8 @@ #include "Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_ID_Factory * @@ -49,6 +51,7 @@ private: TAO_SYNCH_MUTEX mtx_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ID_Factory.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl index f9fb1f5e89b..6aa178a4421 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_Object::ID TAO_Notify_ID_Factory::id (void) { @@ -16,3 +20,5 @@ TAO_Notify_ID_Factory::set_last_used (const TAO_Notify_Object::ID id) this->seed_ = id; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp index cf9160bae6a..eef481b54cf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp @@ -7,6 +7,9 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Queueable, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void) { } @@ -55,3 +58,5 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event* event) this->msg_deadline_time (deadline); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index c47d2ddc2f8..cda7ffe2900 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Method_Request.h * @@ -24,6 +25,8 @@ #include "Event.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Method_Request_Queueable; /** @@ -65,6 +68,8 @@ public: void init (const TAO_Notify_Event * event); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 74a2f0a60e8..0219f09b4de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -11,7 +11,6 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$") #include "EventChannelFactory.h" #include "tao/debug.h" -#include "tao/corba.h" #include "ace/OS_NS_stdio.h" @@ -20,6 +19,8 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Constuct from event TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch ( const TAO_Notify_Event * event, @@ -299,3 +300,4 @@ TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) return request; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h index 73d0b028a3d..9ffabfb9b97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Method_Request_Dispatch.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_DISPATCH_METHOD_REQUEST_H @@ -25,6 +24,8 @@ #include "ProxySupplier.h" #include "Delivery_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_EventChannelFactory; class TAO_InputCDR; class TAO_Notify_Method_Request_Dispatch_Queueable; @@ -126,7 +127,7 @@ private: TAO_Notify_ProxySupplier::Ptr proxy_guard_; }; -/*******************************************************************************************************/ +/*****************************************************************************/ /** * @class TAO_Notify_Method_Request_Dispatch_No_Copy @@ -161,7 +162,9 @@ public: virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL); }; -/*******************************************************************************************************/ +/*****************************************************************************/ + +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_Notify_DISPATCH_METHOD_REQUEST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp index 4b479d58128..6aadb9ed344 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp @@ -5,6 +5,8 @@ ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event ( const TAO_Notify_Event * event) : event_ (event) @@ -96,3 +98,5 @@ TAO_Notify_Method_Request_Event::event() const { return this->event_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 437aa08187d..7c37bd74bd2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Method_Request_Event.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_METHOD_REQUEST_EVENT_H @@ -26,6 +25,8 @@ #include "ace/CORBA_macros.h" #include "Delivery_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Method_Request_Event * @@ -97,5 +98,7 @@ private: TAO_Notify_Event::Ptr event_var_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_EVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 3ae5412ccdd..0318885ea22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -15,7 +15,8 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$") #include "EventChannelFactory.h" #include "tao/debug.h" -#include "tao/corba.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup ( const TAO_Notify_Event * event, @@ -216,3 +217,5 @@ TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) return request; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index b88af7fa181..25d0f683082 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -1,14 +1,12 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Method_Request_Lookup.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ - #ifndef TAO_Notify_LOOKUP_METHOD_REQUEST_H #define TAO_Notify_LOOKUP_METHOD_REQUEST_H #include /**/ "ace/pre.h" @@ -27,6 +25,8 @@ #include "orbsvcs/ESF/ESF_Worker.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Method_Request_Lookup_Queueable; class TAO_Notify_Event; @@ -133,5 +133,7 @@ public: virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_LOOKUP_METHOD_REQUEST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp index 69e6d0aa1ae..d021d9864c4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp @@ -5,6 +5,8 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task) : task_ (task) { @@ -29,3 +31,5 @@ TAO_Notify_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->task_->msg_queue ()->deactivate (); return -1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h index aa93b347070..2d3e0031fae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Method_Request_Shutdown.h * @@ -21,6 +22,8 @@ #include "Method_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ThreadPool_Task; /** @@ -49,5 +52,7 @@ private: TAO_Notify_ThreadPool_Task* task_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_SHUTDOWN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index 27c0c16d782..7d274fd44d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$") #include "Proxy.h" #include "Peer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Method_Request_Updates::TAO_Notify_Method_Request_Updates (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy) : TAO_Notify_Method_Request_Updates_Base (added, removed, proxy) { @@ -38,11 +40,12 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No TAO_Notify_Method_Request_Queueable* TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Notify_Method_Request_Queueable* request; + TAO_Notify_Method_Request_Queueable* request = 0; ACE_NEW_THROW_EX (request, TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_), - CORBA::INTERNAL ()); + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (request); return request; } @@ -52,3 +55,5 @@ TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL) { return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index b072288cf26..c8a069d7249 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Method_Request_Updates.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_METHOD_REQUEST_UPDATES_H @@ -24,6 +23,8 @@ #include "EventTypeSeq.h" #include "Proxy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq , TAO_Notify_Proxy::Ptr , const TAO_Notify_EventTypeSeq& @@ -64,8 +65,9 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base - ,public TAO_Notify_Method_Request +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy + : public TAO_Notify_Method_Request_Updates_No_Copy_Base + , public TAO_Notify_Method_Request { public: /// Constuctor @@ -81,5 +83,7 @@ public: virtual int execute (ACE_ENV_SINGLE_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_UPDATES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp index 5212ae6660c..93482611387 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp @@ -1,4 +1,5 @@ // $Id$ + #ifndef TAO_Notify_Method_Request_Updates_T_CPP #define TAO_Notify_Method_Request_Updates_T_CPP @@ -8,7 +9,7 @@ #include "Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Notify, TAO_Notify_Method_Request_Updates_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed, @@ -22,4 +23,6 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::~TAO_No { } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_Method_Request_Updates_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl index 1beed753ed5..3d55289bbe1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl @@ -1,8 +1,12 @@ +// -*- C++ -*- +// // $Id$ #include "tao/debug.h" #include "Peer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL) { @@ -28,3 +32,5 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp index 3a17fe83265..67e0f59257e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp @@ -7,9 +7,9 @@ namespace { - ACE_UINT64 string_to_uint64(const char * s) + ACE_UINT64 string_to_uint64 (const char * s) { - size_t len = ACE_OS::strlen (s); + size_t const len = ACE_OS::strlen (s); if (len == 0) return 0; if (! isdigit(s[0])) @@ -29,6 +29,8 @@ namespace } } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { NVP::NVP() @@ -205,8 +207,10 @@ namespace TAO_Notify const NVP& NVPList::operator[](size_t ndx) const { - ACE_ASSERT(ndx < list_.size()); + ACE_ASSERT (ndx < list_.size()); return list_[ndx]; } } // namespace TAO_Notify + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h index f3b02be655b..afd5a3bef11 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /** @@ -94,5 +96,7 @@ namespace TAO_Notify }; } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* NAME_VALUE_PAIR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index 277c20ec444..214d4b44764 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -5,6 +5,9 @@ ACE_RCSID(Notify, NS_Constraint_Interpreter, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void) { } @@ -40,7 +43,7 @@ TAO_Notify_Constraint_Interpreter::build_tree ( CORBA::Boolean TAO_Notify_Constraint_Interpreter::evaluate (TAO_Notify_Constraint_Visitor &evaluator) { - CORBA::Boolean retval = evaluator.evaluate_constraint (this->root_); - - return retval; + return evaluator.evaluate_constraint (this->root_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 1eb9eac1efe..793c925db31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -1,11 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Notify_Constraint_Interpreter.h * * $Id$ * - * * @author Pradeep Gore <pradeep@cs.wustl.edu> */ //============================================================================= @@ -25,6 +25,8 @@ #include "orbsvcs/CosNotifyFilterC.h" #include "notify_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Constraint_Visitor; /** @@ -56,5 +58,8 @@ public: /// the evaluator. CORBA::Boolean evaluate (TAO_Notify_Constraint_Visitor &evaluator); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_CONSTRAINT_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index a76c30518d8..0f33b9b1208 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,4 +1,4 @@ -/* $Id$ */ +// $Id$ #include "Notify_Constraint_Visitors.h" #include "orbsvcs/ETCL/ETCL_Constraint.h" @@ -12,6 +12,8 @@ #include "tao/DynamicAny/DynAnyFactory.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY) { @@ -1462,3 +1464,5 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type, } return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index fb4d48ee3ff..c627f41b796 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -1,11 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Notify_Constraint_Visitors.h * * $Id$ * - * * @author Pradeep Gore <pradeep@cs.wustl.edu> * @author Jeff Parsons <parsons@cs.wustl.edu> */ @@ -29,6 +29,8 @@ #include "notify_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Property_Constraint; class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor @@ -144,5 +146,7 @@ protected: CORBA::String_var current_name_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* NOTIFY_CONSTRAINT_VISITORS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index fcc7dacc7df..c7d8405a6b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -4,9 +4,14 @@ ACE_RCSID(Notify, Notify_Default_CO_Factory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Notify_Default_CO_Factory::init_svc (void) { // NOP. return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index c42ff3682a1..e2fa7daa528 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Default_CO_Factory * @@ -37,6 +41,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* NOTIFY_DEFAULT_CO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index d1ac87b35e1..3ba19a305a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -4,9 +4,14 @@ ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Notify_Default_Collection_Factory::init_svc (void) { // NOP. return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 42bbdb9af3c..fb8f4b19e17 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Notify_Default_Collection_Factory.h @@ -20,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Default_Collection_Factory * @@ -36,5 +41,7 @@ public: static int init_svc (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* NOTIFY_DEFAULT_COLLECTION_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 5cfb1d7e8cb..43421dd8e1a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -4,9 +4,14 @@ ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Notify_Default_EMO_Factory::init_svc (void) { // NOP. return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index 7cb29c5264a..d4006d047c1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Notify_Default_EMO_Factory.h @@ -20,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Default_EMO_Factory * @@ -34,5 +39,7 @@ public: static int init_svc (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* NOTIFY_DEFAULT_EMO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 046d1c507ff..36870752bd4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -4,9 +4,14 @@ ACE_RCSID(Notify, Notify_Default_POA_Factory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Notify_Default_POA_Factory::init_svc (void) { // NOP. return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index b80d61f9b53..c8d06c164d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Notify_Default_POA_Factory.h @@ -20,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Default_POA_Factory * @@ -33,5 +38,7 @@ public: static int init_svc (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_DEFAULT_POA_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index fb3587a0e78..90bb5994142 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -7,6 +7,8 @@ #include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Core.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CosNotifyChannelAdmin::EventChannelFactory_ptr TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL) { @@ -20,7 +22,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC return notify_factory._retn (); } - TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*>(default_POA); + TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*> (default_POA); if (poa == 0) return notify_factory._retn (); @@ -35,3 +37,5 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC return notify_factory._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 91278b601ca..be9f5309976 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Notify_EventChannelFactory_i.h @@ -20,6 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_EventChannelFactory_i * @@ -34,5 +38,7 @@ public: static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* NOTIFY_EVENTCHANNELFACTORY_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp index 64dc85743da..7700bf28866 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp @@ -2,7 +2,11 @@ #include "Notify_Extensions.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify_Extensions { - const char *const BlockingPolicy = "BlockingPolicy"; + const char BlockingPolicy[] = "BlockingPolicy"; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h index f79ffa1a0fe..17c7fe3203f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h @@ -21,7 +21,7 @@ namespace TAO_Notify_Extensions { - TAO_NAMESPACE_STORAGE_CLASS const char *const BlockingPolicy; + TAO_NAMESPACE_STORAGE_CLASS const char BlockingPolicy[]; } #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index ceb2606ccfa..eb17074e06b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -15,7 +15,7 @@ ACE_RCSID(Notify, TAO_Notify_Object, "$Id$") - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify_Object::TAO_Notify_Object (void) : poa_ (0) @@ -358,3 +358,5 @@ TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs) this->qos_properties_.init (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 4e10be4a79a..b88b0735866 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Object.h * @@ -31,6 +32,8 @@ #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_POA_Helper; class TAO_Notify_Timer; class TAO_Notify_RT_Builder; @@ -203,6 +206,8 @@ private: bool shutdown_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Object.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl index 8ea54d6f1f1..fcc77e8b4d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Long TAO_Notify_Object::id (void) const { @@ -89,3 +93,5 @@ TAO_Notify_Object::admin_properties (void) ACE_ASSERT( this->admin_properties_.get() != 0 ); return *this->admin_properties_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 6315d38f3e9..048b6d5a04f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -14,6 +14,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif // DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void) { } @@ -212,3 +214,5 @@ TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL) poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER); // The <wait_for_completion> flag = 0 } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index 7025c7aa0bb..af856d988cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file POA_Helper.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_POA_Helper_H @@ -26,6 +25,8 @@ #include "ace/Copy_Disabled.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_POA_Helper * @@ -39,7 +40,9 @@ public: TAO_Notify_POA_Helper (void); /// Create a new PortableServer::POA. - void init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL); + void init (PortableServer::POA_ptr parent_poa, + const char* poa_name + ACE_ENV_ARG_DECL); /// Create a new PortableServer::POA. The name is chosen at random. void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL); @@ -54,34 +57,44 @@ public: void destroy (ACE_ENV_SINGLE_ARG_DECL); /// Activate Object, the POA will assign an ID and return its value. - CORBA::Object_ptr activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL); + CORBA::Object_ptr activate (PortableServer::Servant servant, + CORBA::Long& id + ACE_ENV_ARG_DECL); /// Activate Object, using existing ID CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL); /// Deactivate Object with ID - void deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const; + void deactivate (CORBA::Long id + ACE_ENV_ARG_DECL) const; /// Convert ID to reference. - CORBA::Object_ptr id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const; + CORBA::Object_ptr id_to_reference (CORBA::Long id + ACE_ENV_ARG_DECL) const; /// Convert reference to pointer to servant - PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const; + PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr + ACE_ENV_ARG_DECL) const; CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant ACE_ENV_ARG_DECL) const; protected: /// Set default POA policies. - virtual void set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL); + virtual void set_policy (PortableServer::POA_ptr parent_poa, + CORBA::PolicyList &policy_list + ACE_ENV_ARG_DECL); /// Apply the polices and create child POA. - void create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL); + void create_i (PortableServer::POA_ptr parent_poa, + const char* poa_name, + CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL); /// Generate a unique id for each POA created. ACE_CString get_unique_id (void); /// Convert id to ObjectID - PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const; + PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id + ACE_ENV_ARG_DECL) const; protected: /// POA @@ -91,6 +104,8 @@ protected: TAO_Notify_ID_Factory id_factory_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "POA_Helper.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl index e11089afb4d..dc559fb00c4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE PortableServer::POA_ptr TAO_Notify_POA_Helper::poa (void) { return this->poa_.in (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp index 50659fef095..b9f5c52426a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$") #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Peer::TAO_Notify_Peer (void) { } @@ -118,3 +120,5 @@ TAO_Notify_Peer::_decr_refcnt (void) { return this->proxy ()->_decr_refcnt (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 3753ec2e596..6612cfd7b42 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Peer.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PEER_H @@ -22,6 +21,8 @@ #include "orbsvcs/CosNotificationC.h" #include "EventTypeSeq.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Proxy; class TAO_Notify_QoSProperties; class TAO_Notify_Peer; @@ -78,5 +79,7 @@ private: virtual void release (void) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_PEER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 8e27e57dad0..fbe550de915 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -10,6 +10,8 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -394,3 +396,5 @@ Persistent_File_Allocator::run() } } /* namespace TAO_Notify */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index 05e50545173..7d0c335aeb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -30,10 +30,11 @@ #include "ace/Unbounded_Queue.h" #include "ace/Thread_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { - /// \brief An interface to allow callbacks on completion of persistent storage /// requests. class TAO_Notify_Serv_Export Persistent_Callback @@ -201,5 +202,7 @@ private: } /* namespace TAO_Notify */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* PERSISTENT_FILE_ALLOCATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index ff123bb9fc0..43715586fbb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Notify, TAO_Notify_Properties, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Properties::TAO_Notify_Properties (void) : factory_ (0) , builder_ (0) @@ -38,3 +40,5 @@ TAO_Notify_Properties::~TAO_Notify_Properties () #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template class TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex> *TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index e872da4d5de..96119e8bb3e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Properties.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROPERTIES_H @@ -27,6 +26,8 @@ #include "tao/TAO_Singleton.h" #include "tao/ORB.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Factory; class TAO_Notify_Builder; @@ -38,8 +39,6 @@ class TAO_Notify_Builder; */ class TAO_Notify_Serv_Export TAO_Notify_Properties { - friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>; - public: /// Constuctor TAO_Notify_Properties (void); @@ -145,6 +144,8 @@ TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYN typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Properties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl index c8a7893f4d7..c53e7087f8e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_Factory* TAO_Notify_Properties::factory (void) { @@ -143,3 +147,5 @@ TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotificat { this->pc_qos_ = pc_qos; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index 7479b98cc65..cbc9485a6cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -26,6 +26,9 @@ #include "tao/TimeBaseC.h" template <class LOCK, class TYPE> class ACE_Atomic_Op; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class TYPE> class TAO_Notify_Property_T; template <class TYPE> class TAO_Notify_StructProperty_T; @@ -37,6 +40,8 @@ typedef TAO_Notify_Property_T<TimeBase::TimeT> TAO_Notify_Property_Time; typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams> TAO_Notify_Property_ThreadPool; typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams> TAO_Notify_Property_ThreadPoolLanes; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_PROPERTY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp index df5beffdb21..3e2a0472b3c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp @@ -8,6 +8,8 @@ ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void) { } @@ -59,3 +61,5 @@ TAO_Notify_PropertySeq::add(const ACE_CString& name, const CORBA::Any& val) ACE_ASSERT(ret >= 0); ACE_UNUSED_ARG (ret); // because the assert disappears in release builds } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index 1325b724e81..67b1e9f3124 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file PropertySeq.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROPERTYSEQ_H @@ -26,6 +25,8 @@ #include "ace/SString.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_PropertySeq * @@ -65,6 +66,8 @@ protected: PROPERTY_MAP property_map_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "PropertySeq.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl index b96345cb11a..043f28ab9b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl @@ -1,7 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int -TAO_Notify_PropertySeq::find (const char* name, CosNotification::PropertyValue& value) const +TAO_Notify_PropertySeq::find (const char* name, + CosNotification::PropertyValue& value) const { ACE_CString str_name (name); return this->property_map_.find (str_name, value); @@ -14,3 +19,4 @@ TAO_Notify_PropertySeq::size() const return this->property_map_.current_size(); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp index 6428fec8072..01292422e60 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp @@ -10,8 +10,10 @@ ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$") #include "PropertySeq.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Property_Boolean::TAO_Notify_Property_Boolean (const char* name) - :name_ (name), valid_(0) + : name_ (name), valid_(0) { } @@ -41,3 +43,5 @@ TAO_Notify_Property_Boolean::get (CosNotification::PropertySeq& prop_seq) prop_seq[prop_seq.length () - 1].value <<= CORBA::Any::from_boolean (this->value_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index e2d8487d0d8..b70b06e415b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Property_Boolean.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROPERTY_BOOLEAN_H @@ -22,6 +21,8 @@ #include "orbsvcs/CosNotificationC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_PropertySeq; /** @@ -77,6 +78,8 @@ protected: CORBA::Boolean valid_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Property_Boolean.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl index b1a469809bb..bccd42bed59 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_Property_Boolean& TAO_Notify_Property_Boolean::operator= (const TAO_Notify_Property_Boolean& rhs) { @@ -55,3 +58,5 @@ TAO_Notify_Property_Boolean::is_valid (void) const { return this->valid_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index 0b6aad318ae..e4645971b8b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -15,25 +15,28 @@ ACE_RCSID (Notify, #include "PropertySeq.h" -/*******************************************************************************/ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +/*****************************************************************************/ template <class TYPE> TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name) - :name_ (name), valid_(0) + : name_ (name), valid_(0) { } template <class TYPE> TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name, const TYPE& initial) - :name_ (name), value_ (initial), valid_ (1) + : name_ (name), value_ (initial), valid_ (1) { } template <class TYPE> -TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const TAO_Notify_PropertyBase_T &rhs) -:name_ (rhs.name_), - value_ (rhs.value_), - valid_ (rhs.valid_) +TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T ( + const TAO_Notify_PropertyBase_T &rhs) + : name_ (rhs.name_), + value_ (rhs.value_), + valid_ (rhs.valid_) { } @@ -108,7 +111,8 @@ TAO_Notify_StructProperty_T<TYPE>::TAO_Notify_StructProperty_T (const char* name } template <class TYPE> int -TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_seq) +TAO_Notify_StructProperty_T<TYPE>::set ( + const TAO_Notify_PropertySeq& property_seq) { CosNotification::PropertyValue value; @@ -128,4 +132,6 @@ TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_s return -1; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_PROPERTY_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index b1b6b7c39f0..e30f0df0d6b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Property_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROPERTY_T_H @@ -24,6 +23,8 @@ #include "orbsvcs/CosNotificationC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_PropertySeq; /** @@ -151,6 +152,8 @@ protected: CORBA::Boolean valid_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Property_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl index 31d5290c72d..7f66d30c0c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class TYPE> ACE_INLINE const TYPE& TAO_Notify_PropertyBase_T<TYPE>::value (void) const { @@ -71,3 +73,5 @@ TAO_Notify_StructProperty_T<TYPE>::is_valid (void) const { return this->valid_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp index 861dc279f09..b5c3cc63fc8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp @@ -6,7 +6,7 @@ #include "Proxy.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$") +ACE_RCSID(Notify, TAO_Notify_Proxy, "$Id$") #include "Peer.h" #include "Proxy.h" @@ -16,8 +16,10 @@ ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$") #include "POA_Helper.h" #include "Topology_Saver.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Proxy::TAO_Notify_Proxy (void) - :updates_off_ (0) + : updates_off_ (0) { } @@ -195,3 +197,5 @@ TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id, } return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index c213387be0d..7804ed43040 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Proxy.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROXY_H @@ -25,6 +24,8 @@ #include "FilterAdmin.h" #include "Admin.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Admin; class TAO_Notify_Peer; @@ -127,6 +128,8 @@ protected: CORBA::Boolean updates_off_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Proxy.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl index ef84390455c..6eff985b31e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_Notify_Proxy::updates_off (void) { @@ -32,3 +36,5 @@ TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event return val; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 5d309383a26..e7a88a5299f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -6,7 +6,7 @@ #include "ProxyConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$") +ACE_RCSID(Notify, TAO_Notify_ProxyConsumer, "$Id$") #include "tao/debug.h" #include "ace/Atomic_Op.h" @@ -21,11 +21,14 @@ ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$") #include "SupplierAdmin.h" #include "EventChannel.h" #include "Routing_Slip.h" + //#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void) : supplier_admin_ (0) { @@ -193,3 +196,5 @@ TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL) this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index aa927dedbab..2da1623c562 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ProxyConsumer.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROXYCONSUMER_H @@ -27,6 +26,8 @@ #include "ace/Auto_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Supplier; /** @@ -35,7 +36,8 @@ class TAO_Notify_Supplier; * @brief Base class for all types of ProxyConsumer implementations. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy +class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer + : public virtual TAO_Notify_Proxy { public: typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> Ptr; @@ -93,6 +95,8 @@ private: virtual TAO_Notify_Peer* peer (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ProxyConsumer.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl index 4ad429ba0e5..b2b0c8bb5c8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE bool TAO_Notify_ProxyConsumer::is_connected (void) const { @@ -18,3 +22,5 @@ TAO_Notify_ProxyConsumer::supplier_admin (void) ACE_ASSERT( this->supplier_admin_.get() != 0 ); return *this->supplier_admin_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp index 2f836c0302a..07717d00a8b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp @@ -6,10 +6,10 @@ #include "ProxyConsumer_T.h" #include "SupplierAdmin.h" -ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$") - #include "Event_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class SERVANT_TYPE> TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void) { @@ -62,16 +62,23 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E this->subscribed_types_.add_and_remove (seq_added, seq_removed); } - this->event_manager().offer_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER); + this->event_manager().offer_change (this, + seq_added, + seq_removed + ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotification::EventTypeSeq* -TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types ( + CosNotifyChannelAdmin::ObtainInfoMode mode + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain_types (mode, this->event_manager().subscription_types () ACE_ENV_ARG_PARAMETER); + return + this->obtain_types (mode, this->event_manager().subscription_types () + ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_PROXYCONSUMER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index f8ee14512bf..7505ad91258 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ProxyConsumer_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROXYCONSUMER_T_H @@ -23,6 +22,8 @@ #include "Proxy_T.h" #include "ProxyConsumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_ProxyConsumer_T * @@ -71,6 +72,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ProxyConsumer_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 0f1733335f3..ee46f9d7018 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -6,7 +6,7 @@ #include "ProxySupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$") +ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$") #include "Event_Manager.h" #include "AdminProperties.h" @@ -17,6 +17,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$") #include "Properties.h" #include "ConsumerAdmin.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void) : consumer_admin_ (0) { @@ -154,3 +156,5 @@ TAO_Notify_ProxySupplier::qos_changed (const TAO_Notify_QoSProperties& qos_prope { TAO_Notify_Proxy::qos_changed (qos_properties); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 31615beec88..90d74bd96ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ProxySupplier.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROXYSUPPLIER_H @@ -25,6 +24,8 @@ #include "orbsvcs/CosEventChannelAdminC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Consumer; class TAO_Notify_Method_Request_Dispatch_No_Copy; /** @@ -90,6 +91,8 @@ private: virtual TAO_Notify_Peer* peer (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ProxySupplier.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl index 46b16302e2e..c7afa257d59 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE bool TAO_Notify_ProxySupplier::is_connected (void) const { @@ -18,3 +22,5 @@ TAO_Notify_ProxySupplier::consumer_admin (void) ACE_ASSERT( this->consumer_admin_.get() != 0 ); return *this->consumer_admin_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index c926f4f5824..84e8b3e021b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -1,12 +1,10 @@ // $Id$ -#ifndef TAO_Notify_PROXYSUPPLIER_T_C -#define TAO_Notify_PROXYSUPPLIER_T_C +#ifndef TAO_Notify_PROXYSUPPLIER_T_CPP +#define TAO_Notify_PROXYSUPPLIER_T_CPP #include "ProxySupplier_T.h" -ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$") - #include "Consumer.h" #include "Structured/StructuredEvent.h" #include "Any/AnyEvent.h" @@ -16,9 +14,11 @@ ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$") #include "Event_Manager.h" #include "ConsumerAdmin.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class SERVANT_TYPE> TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void) - :is_suspended_ (0) + : is_suspended_ (0) { } @@ -222,4 +222,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mapp ACE_THROW (CORBA::NO_IMPLEMENT ()); } -#endif /* #define TAO_Notify_PROXYSUPPLIER_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* #define TAO_Notify_PROXYSUPPLIER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index 5c18d79424e..ec59af8dc55 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ProxySupplier_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_PROXYSUPPLIER_T_H @@ -22,6 +21,8 @@ #include "Proxy_T.h" #include "ProxySupplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_ProxySupplier_T * @@ -146,6 +147,8 @@ protected: )); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ProxySupplier_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp index 4858f2da0c3..cb186669514 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp @@ -5,7 +5,7 @@ #ifndef TAO_Notify_PROXY_T_CPP #define TAO_Notify_PROXY_T_CPP -ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class SERVANT_TYPE> TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void) @@ -160,4 +160,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_PROXY_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index b9b0e26ee0f..25fdfac6e99 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Proxy_T.h * @@ -22,6 +23,9 @@ #include "Proxy.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Proxy_T * @@ -143,6 +147,8 @@ template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Proxy_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp index a25544ae6a5..f6c0d13f7d1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp @@ -11,20 +11,22 @@ ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$") #include "Property.h" #include "Notify_Extensions.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void) -: event_reliability_(CosNotification::EventReliability) -, connection_reliability_(CosNotification::ConnectionReliability) -, priority_ (CosNotification::Priority) -, timeout_ (CosNotification::Timeout) -, stop_time_supported_ (CosNotification::StopTimeSupported) -, maximum_batch_size_ (CosNotification::MaximumBatchSize) -, pacing_interval_ (CosNotification::PacingInterval) -, max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer) -, discard_policy_ (CosNotification::DiscardPolicy) -, order_policy_ (CosNotification::OrderPolicy) -, thread_pool_ (NotifyExt::ThreadPool) -, thread_pool_lane_ (NotifyExt::ThreadPoolLanes) -, blocking_policy_(TAO_Notify_Extensions::BlockingPolicy) + : event_reliability_(CosNotification::EventReliability) + , connection_reliability_(CosNotification::ConnectionReliability) + , priority_ (CosNotification::Priority) + , timeout_ (CosNotification::Timeout) + , stop_time_supported_ (CosNotification::StopTimeSupported) + , maximum_batch_size_ (CosNotification::MaximumBatchSize) + , pacing_interval_ (CosNotification::PacingInterval) + , max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer) + , discard_policy_ (CosNotification::DiscardPolicy) + , order_policy_ (CosNotification::OrderPolicy) + , thread_pool_ (NotifyExt::ThreadPool) + , thread_pool_lane_ (NotifyExt::ThreadPoolLanes) + , blocking_policy_(TAO_Notify_Extensions::BlockingPolicy) { unsupported_[0] = CosNotification::StartTimeSupported; } @@ -212,3 +214,5 @@ TAO_Notify_QoSProperties::transfer (TAO_Notify_QoSProperties& qos_properties) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index 3f075a1dcbc..086f8934b25 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file QoSProperties.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_QOSPROPERTIES_H @@ -25,6 +24,8 @@ #include "Property_Boolean.h" #include "Property.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_QoSProperties * @@ -108,6 +109,8 @@ protected: TAO_Notify_Property_Time blocking_policy_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "QoSProperties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl index cc822edf7e4..6cf7f8f44fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const TAO_Notify_Property_Short& TAO_Notify_QoSProperties::event_reliability(void) const @@ -155,3 +159,5 @@ TAO_Notify_QoSProperties::order_policy(void) { return this->order_policy_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 99000054e16..18b2b74e182 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -14,6 +14,8 @@ ACE_RCSID (RT_Notify, TAO_Notify_RT_Builder, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void) { } @@ -66,5 +68,6 @@ TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object // Give ownership of proxy_poa object.set_proxy_poa (auto_proxy_poa.release ()); - } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h index d8e5834d2e3..897fffe1ad4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_Builder.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_RT_BUILDER_H @@ -21,6 +20,8 @@ #include "Builder.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_RT_Builder * @@ -43,5 +44,7 @@ public: virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_RT_BUILDER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp index 014c4da3984..bb817a8617e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp @@ -5,6 +5,9 @@ ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void) { } @@ -123,4 +126,6 @@ TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_RT_Notify, TAO_Notify_RT_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 79de7f0749d..7ab6d865d24 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_Factory.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_RT_FACTORY_H @@ -21,6 +20,8 @@ #include "Default_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_RT_Factory * @@ -91,6 +92,8 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index 189319af746..a7dea4d13d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -10,6 +10,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$") #include "RT_Factory.h" #include "RT_Builder.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Notify_Service::TAO_RT_Notify_Service (void) { } @@ -91,4 +93,6 @@ TAO_RT_Notify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL) return builder; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_RT_Notify,TAO_RT_Notify_Service) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h index 20d41834c10..27c5cdb9a8e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_Notify_Service.h * @@ -21,6 +22,8 @@ #include "CosNotify_Service.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Notify_Service * @@ -52,6 +55,8 @@ protected: virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DECLARE (TAO_RT_Notify,TAO_RT_Notify_Service) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 2631faef282..9d95c26c4f9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -7,10 +7,12 @@ #include "RT_Properties.h" #include "ace/SString.h" -ACE_RCSID (RT_Notify, +ACE_RCSID (Notify, TAO_Notify_RT_POA_Helper, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper () { } @@ -160,3 +162,5 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_D this->create_i (parent_poa, child_poa_name.c_str (), policy_list ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index 23a14864aff..fd17fce6758 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_POA_Helper.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_RT_POA_Helper_H @@ -22,6 +21,8 @@ #include "POA_Helper.h" #include "orbsvcs/NotifyExtC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_RT_POA_Helper * @@ -56,5 +57,7 @@ public: void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_RT_POA_Helper_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp index 07cca498c58..6fc6494275c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp @@ -8,6 +8,9 @@ ACE_RCSID(RT_Notify, TAO_Notify_RT_Properties, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void) { } @@ -15,3 +18,5 @@ TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void) TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h index 31cffb6d9db..9ca1e3bd267 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_Properties.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_RT_PROPERTIES_H @@ -22,6 +21,8 @@ #include "tao/TAO_Singleton.h" #include "tao/RTCORBA/RTCORBA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_RT_Properties * @@ -57,6 +58,8 @@ TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_RT_Properties, TAO_SY typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "RT_Properties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl index 8451193ea97..71fae93e7ba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE RTCORBA::RTORB_ptr TAO_Notify_RT_Properties::rt_orb (void) @@ -24,3 +27,5 @@ TAO_Notify_RT_Properties::current (RTCORBA::Current_ptr current) { current_ = RTCORBA::Current::_duplicate (current); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index ca9b3cf010e..e2fa60b0451 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -9,6 +9,8 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -154,3 +156,5 @@ Random_File::sync() } } /* namespace TAO_Notify */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index a58e6f21e0e..bf8fb72a1cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,10 +23,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "notify_serv_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/FILE.h" #include "ace/streams.h" #include "ace/Synch_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -85,5 +88,7 @@ private: } /* namespace TAO_Notify */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* RANDOM_FILE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp index 6f03de8e3bb..747635dac2c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp @@ -10,6 +10,8 @@ ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$") #include "Timer_Reactor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void) :timer_ (0) { @@ -53,3 +55,5 @@ TAO_Notify_Reactive_Task::timer (void) { return this->timer_.get(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index 341e3f3789e..66ce974e12e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Reactive_Task.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_REACTIVE_TASK_H @@ -24,13 +23,17 @@ #include "AdminProperties.h" #include "Timer_Reactor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Reactive_Task * - * @brief A reactive worker task. Simply executes the command in the caller's context. + * @brief A reactive worker task. Simply executes the command in the + * caller's context. * */ -class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task +class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task + : public TAO_Notify_Worker_Task { public: /// Constuctor @@ -63,6 +66,9 @@ private: virtual void release (void); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Reactive_Task.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl index 239c919549b..d2b6ec811e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_Buffering_Strategy* TAO_Notify_Reactive_Task::buffering_strategy (void) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp index 6557823e111..0ac69eb3698 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp @@ -1,5 +1,3 @@ -/* -*- C++ -*- */ - //============================================================================= /** * @file Reconnect_Worker_T.cpp @@ -19,6 +17,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { template<class TOPOOBJ> @@ -36,4 +36,6 @@ namespace TAO_Notify } } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* RECONNECT_WORKER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h index 8190037e3bd..add7fd2ef1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /** @@ -37,6 +39,8 @@ namespace TAO_Notify }; } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reconnect_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index 85681eafd55..bc3d05db4a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -1,11 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Reconnection_Registry.cpp * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> - * */ #include "Reconnection_Registry.h" #include "tao/debug.h" @@ -17,6 +17,9 @@ # define DEBUG_LEVEL TAO_debug_level #endif + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { Reconnection_Registry::Reconnection_Registry (Topology_Parent & parent) @@ -242,5 +245,6 @@ namespace TAO_Notify //@@ inform factory } - } // namespace TAO_Notify + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h index 7fd7c455014..a55eb6973c6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h @@ -1,11 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Reconnection_Registry.h * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> - * */ #ifndef TAO_NOTIFY_RECONNECTION_REGISTRY_H @@ -24,6 +24,8 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { static const char REGISTRY_TYPE[] = "reconnect_registry"; @@ -92,5 +94,7 @@ namespace TAO_Notify }; } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ <ace/post.h> #endif /* TAO_NOTIFY_RECONNECTION_REGISTRY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index 29f2061e5ba..0abadb746de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -7,6 +7,8 @@ ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Refcountable::TAO_Notify_Refcountable (void) { } @@ -57,3 +59,5 @@ TAO_Notify_Refcountable::_decr_refcnt (void) return static_cast< CORBA::ULong >( refcount ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index 1d03486f3d1..f05b52c87f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Refcountable.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_REFCOUNTABLE_H @@ -27,25 +26,32 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Refcountable * - * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0. + * @brief Thread-safe refounting, calls the <release> method when + * refcount falls to 0. * - * The refcount is initialized to 0. When an instance of a derived class becomes owned - * by a managed pointer (Refcountable_Guard_T) the reference count becomes non-zero. - * A debug message is printed from the destructor if a refcounted is deleted with a - * non-zero refcount. + * The refcount is initialized to 0. When an instance of a derived + * class becomes owned by a managed pointer (Refcountable_Guard_T) + * the reference count becomes non-zero. A debug message is printed + * from the destructor if a refcounted is deleted with a non-zero + * refcount. * - * Instances declared on the stack should always have a refcount of zero. + * Instances declared on the stack should always have a refcount of + * zero. * - * A method that creates or simply returns an instance of Refcountable should not - * increment the reference count. It is the responsibility of the client to increment - * the reference count (take ownership or guard against deletion). The client cannot - * know if the method will or will not incr the refcount in its behalf. + * A method that creates or simply returns an instance of Refcountable + * should not increment the reference count. It is the responsibility + * of the client to increment the reference count (take ownership or + * guard against deletion). The client cannot know if the method will + * or will not incr the refcount in its behalf. * - * Use Refcountable_Guard_T or similar service to guarantee the exception safe direct - * pairing of increments and decrements. Avoid calling _incr_refcnt and _decr_refcnt. + * Use Refcountable_Guard_T or similar service to guarantee the + * exception safe direct pairing of increments and decrements. Avoid + * calling _incr_refcnt and _decr_refcnt. */ class TAO_Notify_Serv_Export TAO_Notify_Refcountable { @@ -81,6 +87,8 @@ private: ACE_Atomic_Op< TAO_SYNCH_MUTEX, Counter > refcount_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_REFCOUNTABLE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index 555c302e40e..64c90962b50 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Refcountable_Guard_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_H @@ -20,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Refcountable_Guard_T * @@ -67,6 +70,8 @@ private: T* t_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl index 45a92e04262..4ab55e0b75f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl @@ -1,7 +1,11 @@ +// -*- C++ -*- +// // $Id$ #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class T> ACE_INLINE TAO_Notify_Refcountable_Guard_T<T>::TAO_Notify_Refcountable_Guard_T (T *t) : t_ (t) @@ -83,3 +87,5 @@ TAO_Notify_Refcountable_Guard_T<T>::swap( this->t_ = rhs.t_; rhs.t_ = temp; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 16b99f089a3..742a4cb38c4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -24,6 +24,8 @@ #define QUEUE_ALLOWED 1 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /////////////////////// @@ -925,6 +927,6 @@ Routing_Slip::should_retry () const return this->state_ != rssTRANSIENT; } - - } // namespace + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index 5b77343bec8..574632031d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Routing_Slip.h * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> - * - * */ #ifndef TAO_NOTIFY_ROUTING_SLIP_H @@ -27,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations of classes/pointers/collections // referenced from this header class TAO_Notify_EventChannelFactory; @@ -235,5 +236,7 @@ private: } // namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_ROUTING_SLIP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index a19414c65b2..b4e0560b9e2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -4,6 +4,8 @@ #include "Standard_Event_Persistence.h" #include "Persistent_File_Allocator.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -795,3 +797,5 @@ Routing_Slip_Persistence_Manager::remove_from_dllist() } } /* namespace TAO_Notify */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h index d289e46eb87..cdcf735ee14 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -17,17 +17,20 @@ #ifndef ROUTING_SLIP_PERSISTENCE_MANAGER_H #define ROUTING_SLIP_PERSISTENCE_MANAGER_H #include /**/ "ace/pre.h" -#include /**/ "ace/config-all.h" + +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "notify_serv_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/Message_Block.h" #include "ace/Synch_T.h" #include "ace/Containers_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { // Some forward declarations. @@ -258,5 +261,7 @@ private: } /* namespace TAO_Notify */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ROUTING_SLIP_PERSISTENCE_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp index 609ca985cd3..57c6d05b88f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp @@ -10,6 +10,9 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { Routing_Slip_Queue::Routing_Slip_Queue (size_t allowed) @@ -105,3 +108,5 @@ namespace TAO_Notify } } } // namespace + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h index 2a6a8dc3bb5..3609f2e78ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ #ifndef TAO_NOTIFY_ROUTING_SLIP_QUEUE_H @@ -11,6 +12,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /** @@ -84,5 +87,7 @@ namespace TAO_Notify }; } // namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_ROUTING_SLIP_QUEUE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp index 199c60aa032..1be68b66c33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp @@ -1,5 +1,3 @@ -/* -*- C++ -*- */ - //============================================================================= /** * @file Save_Persist_Worker_T.cpp @@ -19,13 +17,14 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { template<class TOPOOBJ> - Save_Persist_Worker<TOPOOBJ>::Save_Persist_Worker( - Topology_Saver& saver, - bool want_all_children) - : saver_(saver) + Save_Persist_Worker<TOPOOBJ>::Save_Persist_Worker(Topology_Saver& saver, + bool want_all_children) + : saver_ (saver) , want_all_children_ (want_all_children) { } @@ -43,4 +42,6 @@ namespace TAO_Notify } } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* SAVE_PERSIST_WORKER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index 740b2128378..ce4aacc2e6d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,9 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /** @@ -45,6 +48,8 @@ namespace TAO_Notify }; } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Save_Persist_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index 98ef75a6bb6..670f81e0723 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -9,7 +9,7 @@ #include "Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Seq_Worker_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void) @@ -33,4 +33,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL) } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_Notify_SEQ_WORKER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 8c0f1949151..7970e4dd796 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Seq_Worker_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_SEQ_WORKER_T_H @@ -23,6 +22,8 @@ #include "orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Seq_Worker_T * @@ -30,7 +31,8 @@ * */ template <class TYPE> -class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE> +class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T + : public TAO_ESF_Worker<TYPE> { typedef TAO_Notify_Container_T<TYPE> CONTAINER; typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; @@ -52,6 +54,8 @@ protected: SEQ_VAR seq_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl index 08a858c55db..43dc3487646 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class TYPE> ACE_INLINE void TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED) { @@ -7,3 +11,5 @@ TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED) this->seq_[this->seq_->length () - 1] = type->id (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 15bd1db1eca..076a83333eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$") #include "../Structured/StructuredEvent.h" #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void) :pacing_interval_ (CosNotification::PacingInterval) { @@ -132,3 +134,4 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 5e65ea9f03b..091f1cf22d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_SequenceProxyPushConsumer * @@ -89,6 +91,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index c87728df2ab..c9c2f2f9d55 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$") #include "SequencePushConsumer.h" #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void) { } @@ -100,3 +102,5 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att ACE_ENDTRY; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 2d727b94e33..c2f2e487346 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; @@ -86,6 +88,8 @@ public: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 689272a738d..b518587a0d2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -20,6 +20,8 @@ ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_SequencePushConsumer::TAO_Notify_SequencePushConsumer (TAO_Notify_ProxySupplier* proxy) : TAO_Notify_Consumer (proxy) { @@ -233,3 +235,5 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o ACE_CHECK; this->schedule_timer(false); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index 09cfbf71969..0819a8b8127 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -27,6 +27,8 @@ #include "../AdminProperties.h" #include "ace/Null_Condition.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxySupplier; class TAO_Notify_QoSProperties; class TAO_Notify_Timer; @@ -86,5 +88,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQUENCEPUSHCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index adaaf0b24af..c8ede9d5937 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -6,6 +6,8 @@ ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$") #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_SequencePushSupplier::TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy) :TAO_Notify_Supplier (proxy) { @@ -51,3 +53,5 @@ TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const ACE_ENDTRY; return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index 24d778e400f..9bd813d2f29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -22,6 +22,8 @@ #include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxyConsumer; /** @@ -53,5 +55,7 @@ protected: CosNotifyComm::SequencePushSupplier_var push_supplier_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQUENCEPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp index c26a1cd3897..814327a8e2b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp @@ -6,7 +6,10 @@ ACE_RCSID (Notify, TAO_Notify_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Service::~TAO_Notify_Service () { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 7d60ea4bac7..17cb759da7d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Service.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_SERVICE_H @@ -19,10 +18,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { class POA; @@ -67,6 +70,8 @@ public: ) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory" #define TAO_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 76674cef2b8..5fd3fe056db 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -6,6 +6,8 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_strings.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -223,5 +225,10 @@ Standard_Event_Persistence_Factory::root() return this->root_; } -ACE_FACTORY_DEFINE (TAO_Notify_Serv, Standard_Event_Persistence) -} +} // End TAO_Notify_Namespace + +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_FACTORY_NAMESPACE_DEFINE (TAO_Notify_Serv, + TAO_Notify_Standard_Event_Persistence, + TAO_Notify::Standard_Event_Persistence) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h index 240ae9533be..c88c0be393e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -27,6 +27,9 @@ #include "Routing_Slip_Persistence_Manager.h" #include <ace/SString.h> + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { static const ACE_UINT32 ROUTING_SLIP_ROOT_BLOCK_NUMBER = 0; @@ -121,9 +124,11 @@ namespace TAO_Notify ACE_UINT32 block_size_; // set via -block_size Standard_Event_Persistence_Factory * factory_; }; - - ACE_FACTORY_DECLARE (TAO_Notify_Serv, Standard_Event_Persistence) } +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Standard_Event_Persistence) + #include /**/ "ace/post.h" #endif /* STANDARD_EVENT_PERSISTENCE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index 96fb800047e..eb59410e675 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void) { } @@ -76,3 +78,4 @@ TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_E ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h index 9a8c923f626..15559b2f7cf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h @@ -21,6 +21,8 @@ #include "StructuredProxyPushSupplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_RT_StructuredProxyPushSupplier * @@ -55,5 +57,7 @@ private: Event_Forwarder::StructuredProxyPushSupplier_var event_forwarder_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index 21d273c3fe7..9e993168809 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -9,6 +9,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$") #include "tao/debug.h" #include "tao/corba.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent ¬ification) : notification_ (¬ification), type_ (notification.header.fixed_header.event_type) { @@ -136,3 +138,5 @@ TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::S TAO_Notify_StructuredEvent::~TAO_Notify_StructuredEvent () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index 516f40d35c4..e38d8afbe3b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -22,6 +22,8 @@ #include "../EventType.h" #include "orbsvcs/CosNotificationC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_StructuredEvent; /** @@ -81,7 +83,7 @@ protected: const TAO_Notify_EventType type_; }; -/*****************************************************************************************************/ +/*****************************************************************************/ /** * @class TAO_Notify_StructuredEvent @@ -104,5 +106,7 @@ protected: CosNotification::StructuredEvent notification_copy; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_STRUCTUREDEVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index 2a4a1c5ee0d..5e8fc65aae6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -12,6 +12,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$") #include "../AdminProperties.h" #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void) { } @@ -125,3 +127,5 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a ACE_ENDTRY; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index d6dd54df0ce..4640a51c449 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_StructuredProxyPushConsumer * @@ -92,6 +94,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index b2febd45d52..00de9633ce4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -11,6 +11,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void) { } @@ -103,3 +105,5 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a ACE_ENDTRY; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index 6e7cef6146f..8ce2c82a09e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; @@ -90,6 +92,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 69c05d5be02..c8e6d5454fc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -7,6 +7,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$") #include "../Event.h" #include "ace/Bound_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy) :TAO_Notify_Consumer (proxy) { @@ -90,3 +92,5 @@ TAO_Notify_StructuredPushConsumer::get_ior (ACE_CString & iorstr) const ACE_ENDTRY; return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index b467d85c403..bb8a83ed5d2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -22,6 +22,8 @@ #include "orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxySupplier; /** @@ -73,5 +75,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index e646558475c..58c10739708 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -5,6 +5,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$") #include "../Properties.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy) :TAO_Notify_Supplier (proxy) { @@ -51,3 +53,5 @@ TAO_Notify_StructuredPushSupplier::get_ior (ACE_CString & iorstr) const ACE_ENDTRY; return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index ccbe0255735..be4d1aebb98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -22,6 +22,8 @@ #include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxyConsumer; /** @@ -55,5 +57,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp index 4856d2a62b6..b4f7cf22a87 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp @@ -6,8 +6,13 @@ ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$") -TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed) -:added_ (added), removed_ (removed) + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker ( + const CosNotification::EventTypeSeq & added, + const CosNotification::EventTypeSeq & removed) + : added_ (added), removed_ (removed) { } @@ -20,3 +25,5 @@ TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy ACE_ENV_ARG { proxy->admin_types_changed (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 873ad8cd3eb..5e388ae5f1f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Subscription_Change_Worker.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_SUBSCRIPTION_CHANGE_WORKER_H @@ -22,6 +21,8 @@ #include "orbsvcs/CosNotificationC.h" #include "orbsvcs/ESF/ESF_Worker.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Proxy; /** @@ -47,5 +48,7 @@ protected: const CosNotification::EventTypeSeq & removed_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SUBSCRIPTION_CHANGE_WORKER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index 378463bf4b7..00f17fa253a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -11,8 +11,10 @@ ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$") #include "ProxyConsumer.h" #include "Proxy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Supplier::TAO_Notify_Supplier (TAO_Notify_ProxyConsumer* proxy) - :proxy_ (proxy) + : proxy_ (proxy) { } @@ -27,9 +29,13 @@ TAO_Notify_Supplier::proxy (void) } void -TAO_Notify_Supplier::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed - ACE_ENV_ARG_DECL) +TAO_Notify_Supplier::dispatch_updates_i ( + const CosNotification::EventTypeSeq& added, + const CosNotification::EventTypeSeq& removed + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (this->subscribe_.in ())) this->subscribe_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index f962cb09302..c772cdef02b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Supplier.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_SUPPLIER_H @@ -22,6 +21,9 @@ #include "Peer.h" #include "orbsvcs/CosNotifyCommC.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_ProxyConsumer; /** @@ -58,6 +60,8 @@ protected: CosNotifyComm::NotifySubscribe_var subscribe_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Supplier.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl index 6d1c528c149..19d48fb5634 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Notify_ProxyConsumer* TAO_Notify_Supplier::proxy_consumer (void) { return this->proxy_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 9affc97ebdd..49085ad396a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -23,10 +23,12 @@ ACE_RCSID (RT_Notify, # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy - , CosNotifyChannelAdmin::ProxyConsumer - , CosNotifyChannelAdmin::ProxyConsumer_ptr - , CosNotifyChannelAdmin::ProxyNotFound> + , CosNotifyChannelAdmin::ProxyConsumer + , CosNotifyChannelAdmin::ProxyConsumer_ptr + , CosNotifyChannelAdmin::ProxyNotFound> TAO_Notify_ProxyConsumer_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker; @@ -424,3 +426,5 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer ( } return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index 2b3dc033fdf..ac31f5af99d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file SupplierAdmin.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_SUPPLIERADMIN_H @@ -23,13 +22,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_Notify_ProxyConsumer; - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_Notify_ProxyConsumer; + /** * @class TAO_Notify_SupplierAdmin * @@ -207,6 +208,8 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h index 609f419193a..733f7982ed7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Supplier_Map.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_SUPPLIER_MAP_H @@ -22,14 +21,17 @@ #include "Event_Map_T.h" #include "ProxyConsumer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** - * @class TAO_Notify_Supplier_Map + * @typedef TAO_Notify_Supplier_Map * * @brief The Event Map for Suppliers. * */ - typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_SUPPLIER_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index a8299c2ecfa..6eb9b9cd23d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -13,9 +13,11 @@ ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$") #include "ace/OS_NS_errno.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void) : shutdown_ (false) - , shutdown_handler_(this) + , shutdown_handler_ (this) { } @@ -211,3 +213,5 @@ TAO_Notify_ThreadPool_Task::update_qos_properties (const TAO_Notify_QoSPropertie { this->buffering_strategy_->update_qos_properties (qos_properties); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index 7c6ad778e5d..35ae030502e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file ThreadPool_Task.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_THREADPOOL_TASK_H @@ -28,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_Buffering_Strategy; /** @@ -36,7 +37,8 @@ class TAO_Notify_Buffering_Strategy; * @brief Implements a Thread Pool Worker Task. * */ -class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH> +class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task + : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH> { friend class TAO_Notify_Method_Request_Shutdown; @@ -113,6 +115,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_THREADPOOL_TASK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index dad8bbe7c55..038eb7c8bcb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Timer.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_TIMER_H @@ -25,6 +24,8 @@ class ACE_Event_Handler; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Timer * @@ -47,5 +48,7 @@ public: virtual int cancel_timer (long timer_id) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_TIMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp index b083b78b6e8..c4ef3fbb87f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp @@ -4,6 +4,8 @@ ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void) { } @@ -24,10 +26,11 @@ TAO_Notify_Timer_Queue::schedule_timer (ACE_Event_Handler *handler, const ACE_Time_Value &delay_time, const ACE_Time_Value &interval) { - return this->timer_queue_.schedule (handler, - 0, - timer_queue_.gettimeofday () + delay_time, - interval); + return + this->timer_queue_.schedule (handler, + 0, + timer_queue_.gettimeofday () + delay_time, + interval); } int @@ -41,3 +44,5 @@ TAO_Notify_Timer_Queue::impl (void) { return this->timer_queue_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index 61179a601bb..fc143b6fd9e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Timer_Queue.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_TIMER_QUEUE_H @@ -25,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Timer_Queue * @@ -63,5 +64,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_TIMER_QUEUE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp index d591dc652b9..0bc8d56bc1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Notify, #include "ace/Reactor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void) :reactor_ (0) { @@ -36,7 +38,7 @@ TAO_Notify_Timer_Reactor::schedule_timer (ACE_Event_Handler *handler, const ACE_Time_Value &delay_time, const ACE_Time_Value &interval) { - return this->reactor_->schedule_timer (handler, 0, delay_time, interval); + return this->reactor_->schedule_timer (handler, 0, delay_time, interval); } int @@ -44,3 +46,5 @@ TAO_Notify_Timer_Reactor::cancel_timer (long timer_id) { return this->reactor_->cancel_timer (timer_id); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h index 1b3319df40a..3fa8cd9168d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Timer_Reactor.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_TIMER_REACTOR_H @@ -22,11 +21,13 @@ class ACE_Reactor; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Notify_Timer_Reactor * - * @brief Reactor::instance based timer. The timers are dispatched by the main thread. - * + * @brief Reactor::instance based timer. The timers are dispatched by + * the main thread. */ class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer { @@ -57,5 +58,7 @@ private: virtual void release (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_TIMER_REACTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h index 30ffaadba58..f578316cb25 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h @@ -1,12 +1,13 @@ +// -*- C++ -*- + /** * @file Topology_Factory.h * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> - * - * */ + #ifndef TAO_NOTIFY_TOPOLOGY_FACTORY_H #define TAO_NOTIFY_TOPOLOGY_FACTORY_H #include /**/ "ace/pre.h" @@ -19,6 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { class Topology_Saver; @@ -42,5 +47,7 @@ namespace TAO_Notify }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp index 253f988ff37..c2274be240f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp @@ -2,6 +2,8 @@ #include "Topology_Loader.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify::Topology_Loader::Topology_Loader () { } @@ -14,3 +16,5 @@ void TAO_Notify::Topology_Loader::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index b6b10232315..252dd5cf064 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -18,12 +18,20 @@ #include "ace/config-all.h" -#include "tao/corba.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" +#include "ace/CORBA_macros.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + class Environment; +} + namespace TAO_Notify { @@ -69,6 +77,8 @@ public: } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TOPOLOGY_LOADER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index f7be8f65e2c..6667c111960 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -13,6 +13,8 @@ // children have been saved in Topology_Object::save_persistent (). // If these rules are followed, the only risk is a (harmless) extra save. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { Topology_Savable::~Topology_Savable (void) @@ -143,3 +145,5 @@ namespace TAO_Notify return -1; } } // namespace TAO_Notify + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index 4014460cda7..333a65a460f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// \namespace TAO_Notify /// \brief A namespace to be used by all of TAO's Notification Service @@ -203,6 +204,8 @@ namespace TAO_Notify } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Topology_Object.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl index efb34f9315f..14363a16d6f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl @@ -1,4 +1,9 @@ +// -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { ACE_INLINE @@ -18,3 +23,4 @@ namespace TAO_Notify } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp index 91873af0136..f8f2e52f16c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp @@ -2,6 +2,8 @@ #include "Topology_Saver.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify::Topology_Saver::~Topology_Saver () { } @@ -9,5 +11,6 @@ TAO_Notify::Topology_Saver::~Topology_Saver () void TAO_Notify::Topology_Saver::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { - } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h index 781da2721b7..dd34b5fa1d1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -17,13 +17,14 @@ #include "Topology_Object.h" #include "notify_serv_export.h" -#include "tao/corba.h" #include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /** @@ -106,6 +107,8 @@ namespace TAO_Notify }; } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TOPOLOGY_SAVER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp index 7c1e767bd0f..579e0b99257 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void) { } @@ -16,3 +18,5 @@ void TAO_Notify_Worker_Task::update_qos_properties (const TAO_Notify_QoSProperties& /*qos_properties*/) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index bef6be6a23f..df0271e2ab9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file Worker_Task.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_Notify_WORKER_TASK_H @@ -23,6 +22,8 @@ #include "Method_Request.h" #include "Refcountable.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Notify_AdminProperties; class TAO_Notify_QoSProperties; class TAO_Notify_Timer; @@ -64,5 +65,7 @@ protected: virtual ~TAO_Notify_Worker_Task (); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_Notify_WORKER_TASK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index d936bd612cc..51f94752f63 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -36,6 +36,8 @@ namespace { } } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { XML_Loader::XML_Loader () @@ -219,3 +221,5 @@ namespace TAO_Notify } } /* namespace TAO_Notify */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index 7e35e9cae55..25f7706b4b7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -27,10 +27,10 @@ #include "ACEXML/parser/parser/Parser.h" #include "ACEXML/common/FileCharStream.h" -#include "tao/corba.h" - #include "ace/streams.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { /// \brief Load Notification Service Topology from an XML file. @@ -81,5 +81,7 @@ private: } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* XML_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index ddd5e397a93..354fe25b173 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -8,6 +8,8 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { XML_Saver::XML_Saver(bool timestamp) @@ -181,11 +183,11 @@ namespace TAO_Notify return true; } - void XML_Saver::end_object (CORBA::Long id, - const ACE_CString& type ACE_ENV_ARG_DECL_NOT_USED) + void XML_Saver::end_object (CORBA::Long /* id */, + const ACE_CString& type + ACE_ENV_ARG_DECL_NOT_USED) { ACE_ASSERT(this->output_ != 0); - ACE_UNUSED_ARG (id); FILE *out = this->output_; if (this->indent_.length() >= 2) { @@ -195,3 +197,5 @@ namespace TAO_Notify type.c_str(), ">\n"); } } /* namespace TAO_Notify */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index 2cbdbf643c0..9659db2d730 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -16,13 +16,14 @@ #include "Topology_Saver.h" -#include "tao/corba.h" #include "ace/streams.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -80,5 +81,7 @@ private: } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* XML_SAVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index 2c74dfedb33..b07ffb1c63a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -8,6 +8,9 @@ #include "ace/OS_NS_strings.h" //#include "ace/Service_Object.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Notify { @@ -144,6 +147,10 @@ namespace TAO_Notify // nothing to do yet return 0; } - - ACE_FACTORY_DEFINE (TAO_Notify_Persist, XML_Topology_Factory) } /* namespace TAO_Notify */ + +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_FACTORY_NAMESPACE_DEFINE (TAO_Notify_Persist, + TAO_Notify_XML_Topology_Factory, + TAO_Notify::XML_Topology_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index 88323bce2ed..09afb0208b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -71,8 +71,11 @@ namespace TAO_Notify bool timestamp_; }; - ACE_FACTORY_DECLARE (TAO_Notify_Persist, XML_Topology_Factory) } // namespace TAO_Notify +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_FACTORY_DECLARE (TAO_Notify_Persist, TAO_Notify_XML_Topology_Factory) + #include /**/ "ace/post.h" #endif /* XML_TOPOLOGY_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 322ebb548b8..8da2b64f743 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -18,6 +18,8 @@ ACE_RCSID (PortableGroup, #include "ace/Auto_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + PortableServer::ObjectId * TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL) @@ -705,3 +707,5 @@ TAO_GOA::associate_group_with_ref ( ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 66cd21907bb..dd869cc7c33 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -33,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Profile; class TAO_PortableGroup_Acceptor_Registry; @@ -314,6 +316,8 @@ protected: PortableGroup::NotAGroupObject)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp index 8148eff7164..ca6f4bdd882 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableGroup, UIPMC_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /*static*/ int @@ -23,3 +25,5 @@ namespace TAO ace_svc_desc_TAO_UIPMC_Protocol_Factory); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index 755901ffff3..3ca193916d0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -19,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -35,5 +39,7 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_MIOP_H*/ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index eefa86f14c7..361651d0487 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableGroup, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void) : membership_ (1), factories_ (1) @@ -145,3 +147,5 @@ TAO_PG_Default_Property_Validator::validate_criteria ( ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria)); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index da03189be1b..96457ed6b2d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -22,6 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PG_Default_Property_Validator @@ -78,6 +79,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_VALIDATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index e3b4b621841..7df26bf8241 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -12,6 +12,8 @@ #include "tao/PortableServer/POAManagerC.h" #include "PG_Operators.h" // operator == on CosNaming::Name +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Use this macro at the beginning of CORBA methods // to aid in debugging. #define METHOD_ENTRY(name) \ @@ -726,3 +728,5 @@ int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char } return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 3f9ae599e2b..0eed6f21d92 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file PG_FactoryRegistry.h @@ -21,6 +22,10 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////////////////// // Classes declared in this header namespace TAO @@ -46,7 +51,8 @@ namespace TAO * Note FactoryRegistry is not part of the OMG standard. It was added * as part of the TAO implementation of Fault Tolerant CORBA */ - class TAO_PortableGroup_Export PG_FactoryRegistry : public virtual POA_PortableGroup::FactoryRegistry + class TAO_PortableGroup_Export PG_FactoryRegistry + : public virtual POA_PortableGroup::FactoryRegistry { struct RoleInfo { @@ -250,6 +256,8 @@ namespace TAO }; } // namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif // TAO_PG_FACTORYREGISTRY_H_ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp deleted file mode 100644 index c731d88453f..00000000000 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// -*- C++ -*- - -#include "PG_Factory_Map.h" - - -ACE_RCSID (PortableGroup, - PG_Factory_Map, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index ff2033929ff..cbd367cb4ff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -29,6 +29,8 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Factory hash map. typedef ACE_Hash_Map_Manager_Ex< ACE_UINT32, @@ -37,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex< ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex> TAO_PG_Factory_Map; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_FACTORY_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp deleted file mode 100644 index e986c8d6cfc..00000000000 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "PG_Factory_Set.h" - -ACE_RCSID (PortableGroup, - PG_Factory_Set, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index 3bca619031f..9b545e49831 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -26,6 +26,7 @@ #include "ace/Array_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PG_Factory_Node @@ -50,6 +51,7 @@ struct TAO_PG_Factory_Node typedef ACE_Array_Base<TAO_PG_Factory_Node> TAO_PG_Factory_Set; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 1a9c5f8b23f..f0f3de9d9bc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -13,6 +13,9 @@ ACE_RCSID (PortableGroup, PG_GenericFactory, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PG_GenericFactory::TAO_PG_GenericFactory ( TAO_PG_ObjectGroupManager & object_group_manager, TAO_PG_PropertyManager & property_manager) @@ -773,3 +776,5 @@ TAO_PG_GenericFactory::create_member ( return fcid._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 8123d3d3828..72115e812e0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -28,6 +28,7 @@ #include "orbsvcs/PortableGroupC.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Forward declarations. class TAO_PG_ObjectGroupManager; @@ -240,6 +241,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index bd6af066385..022f1649c75 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -22,6 +22,8 @@ ACE_RCSID (PortableGroup, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PG_Group_Factory::PG_Group_Factory () : orb_ (CORBA::ORB::_nil()) , poa_ (PortableServer::POA::_nil()) @@ -226,3 +228,5 @@ TAO::PG_Group_Factory::groups_at_location ( result->length (group_count); return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index 9ef00e3d20a..23bb431a92c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -30,6 +30,9 @@ #include "ace/ACE.h" #include "ace/Hash_Map_Manager.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////// // Forward reference namespace TAO @@ -37,8 +40,6 @@ namespace TAO class PG_Property_Set; } // namespace TAO_PG - - namespace TAO { ///////////////////// @@ -176,6 +177,8 @@ namespace TAO }; } // namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_GROUP_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp index 7a7c359da50..041f605bb85 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp @@ -9,6 +9,8 @@ ACE_RCSID (PortableGroup, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PG_Group_Guard::TAO_PG_Group_Guard ( TAO_PG_GenericFactory & generic_factory, TAO_PG_Factory_Set & factory_set, @@ -54,3 +56,4 @@ TAO_PG_Group_Guard::release (void) this->released_ = 1; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h index 8fd7d844619..3c0d719f243 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h @@ -26,13 +26,12 @@ #include "tao/PortableServer/PortableServerC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Forward declarations. class TAO_PG_GenericFactory; class TAO_PG_ObjectGroupManager; - - /** * @class TAO_PG_Group_Guard * @@ -87,6 +86,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index 224daf9c011..7d7014f5437 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -26,6 +26,7 @@ #include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PG_Location_Equal_To @@ -47,6 +48,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "PG_Location_Equal_To.inl" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl index 2c9ab16375a..052d968242b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int TAO_PG_Location_Equal_To::operator () ( const PortableGroup::Location &lhs, @@ -9,3 +11,5 @@ TAO_PG_Location_Equal_To::operator () ( { return lhs == rhs; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index 105ef25e6db..f39d7b72f7e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -26,6 +26,8 @@ #include "orbsvcs/PortableGroupC.h" #include "ace/ACE.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PG_Location_Hash * @@ -40,6 +42,7 @@ public: CORBA::ULong operator() (const PortableGroup::Location &) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "PG_Location_Hash.inl" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl index 41fe3d62519..a0b591b1068 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::ULong TAO_PG_Location_Hash::operator() ( const PortableGroup::Location &location) const @@ -19,3 +21,5 @@ TAO_PG_Location_Hash::operator() ( return hash; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp deleted file mode 100644 index 0ff336e3c93..00000000000 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- - -#include "PG_Location_Map.h" - -ACE_RCSID (PortableGroup, - PG_Location_Map, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index 6786897aa0f..44df85af5f0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -31,6 +31,8 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. struct TAO_PG_ObjectGroup_Map_Entry; @@ -45,6 +47,8 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_PG_Location_Map; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_LOCATION_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp index 8746e2958ff..791ca59e531 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp @@ -5,6 +5,7 @@ ACE_RCSID (PortableGroup, PG_MemberInfo, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs) @@ -13,3 +14,5 @@ TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs) // important. return location == rhs.location; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index 919c58f7ca5..41d428bd0bb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -25,6 +25,8 @@ #include "orbsvcs/PortableGroupC.h" #include "ace/Unbounded_Set.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PG_MemberInfo * @@ -51,9 +53,9 @@ struct TAO_PG_MemberInfo }; - typedef ACE_Unbounded_Set<TAO_PG_MemberInfo> TAO_PG_MemberInfo_Set; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp index ef9eb998bb8..71e7d62a7f6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp @@ -5,6 +5,7 @@ ACE_RCSID (PortableGroup, PG_Null_Property_Validator, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PG_Null_Property_Validator::validate_property ( @@ -25,3 +26,5 @@ TAO_PG_Null_Property_Validator::validate_criteria ( PortableGroup::CannotMeetCriteria)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 573430ccf66..7498b80d110 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -23,6 +23,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PG_Null_Property_Validator * @@ -58,6 +60,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_VALIDATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 5152cdac17c..d80c190e564 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -14,6 +14,8 @@ ACE_RCSID (PortableGroup, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void) : poa_ (), object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS), @@ -865,3 +867,5 @@ TAO_PG_ObjectGroupManager::generic_factory ( { this->generic_factory_ = generic_factory; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 962a9a1232a..c7a3c4a9fd9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -30,6 +30,8 @@ #include "tao/PortableServer/PortableServerC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations class TAO_PG_GenericFactory; @@ -305,6 +307,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp deleted file mode 100644 index 75e6324bce6..00000000000 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "PG_ObjectGroup_Map.h" - -ACE_RCSID (PortableGroup, - PG_ObjectGroup_Map, - "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index b754df541a2..b7cd89c309b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -32,6 +32,8 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PG_ObjectGroup_Map_Entry * @@ -75,6 +77,7 @@ typedef ACE_Hash_Map_Manager_Ex< ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex> TAO_PG_ObjectGroup_Map; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp index 9cdce730ed6..38ae410781b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp @@ -10,6 +10,7 @@ ACE_RCSID (TAO_PortableGroup, PG_Object_Adapter_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void) { @@ -36,6 +37,8 @@ TAO_PG_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return object_adapter; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory, ACE_TEXT ("TAO_GOA"), @@ -43,4 +46,3 @@ ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory, &ACE_SVC_NAME (TAO_PG_Object_Adapter_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h index 189d77873a8..c7367fbe3fa 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Object_Adapter_Factory.h @@ -24,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object_Adapter_Factory { public: @@ -34,6 +37,8 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_PG_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index e61dd872186..cc977348a1d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -27,6 +27,7 @@ #define TODO int todo; //#define TODO +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PG_Object_Group::MemberInfo::MemberInfo ( CORBA::Object_ptr member, @@ -886,6 +887,8 @@ TAO::PG_Object_Group::has_member_at (const PortableGroup::Location & location) return (0 == this->members_.find (location)); } +TAO_END_VERSIONED_NAMESPACE_DECL + // Restore original compiler flags. #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564) # pragma option pop diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 09f8ebba42c..61606a2548c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file PG_Object_Group.h @@ -38,6 +39,8 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/ACE.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ///////////////////// // Forward references @@ -372,6 +375,8 @@ namespace TAO }; } // namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif // TAO_PG_OBJECT_GROUP_H_ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index d55a858f22c..6b55e12e309 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -20,6 +20,9 @@ ACE_RCSID (PortableGroup, PG_Object_Group_Manipulator, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator () : orb_ (CORBA::ORB::_nil ()) , poa_ (PortableServer::POA::_nil ()) @@ -183,3 +186,5 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member) } #endif } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 881a7437ade..85f734f442c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -26,6 +26,8 @@ #include "tao/IORManipulation/IORManip_Loader.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -114,6 +116,7 @@ namespace TAO }; } //namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp index 99436d883a5..4e16737bc2f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableGroup, PG_Operators, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool operator== (const CosNaming::Name & lhs, const CosNaming::Name & rhs) { @@ -27,3 +29,5 @@ operator!= (const CosNaming::Name & lhs, const CosNaming::Name & rhs) { return !(lhs == rhs); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index 881c5330403..b6d7097b7e9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -25,6 +25,8 @@ #include "orbsvcs/CosNamingC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Global CosNaming::Name equality operator. /** * Used for checking equality of PortableGroup::Location and @@ -41,6 +43,7 @@ bool TAO_PortableGroup_Export operator== (const CosNaming::Name & lhs, bool TAO_PortableGroup_Export operator!= (const CosNaming::Name & lhs, const CosNaming::Name & rhs); +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp index 5dc23baa0a8..8e3f140b8a4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ //============================================================================= /** * @file PG_Properties_Encoder.cpp @@ -18,6 +17,8 @@ #include "PG_Properties_Encoder.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////// // Properties_Encoder TAO_PG::Properties_Encoder::Properties_Encoder () @@ -62,3 +63,5 @@ void TAO_PG::Properties_Encoder::encode ( // nc.kind defaults to empty. Leave it that way (for now) } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index d171ec5590a..92736c4f28f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Properties_Encoder.h @@ -26,6 +27,8 @@ #include "ace/Vector_T.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_PG { /** @@ -89,6 +92,8 @@ namespace TAO_PG } //namespace TAO_PG +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "PG_Properties_Encoder.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl index 17fadf5df67..aa64246f6a5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Properties_Encoder.inl @@ -8,6 +9,9 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_PG { ACE_INLINE @@ -57,3 +61,4 @@ namespace TAO_PG } //namespace TAO_PG +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp index 907c2959ae2..49235842db3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Properties_Support.cpp @@ -13,6 +14,8 @@ #include "PG_Properties_Support.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PG_Properties_Support::PG_Properties_Support () { } @@ -144,3 +147,5 @@ TAO::PG_Properties_Support::find_typeid_properties ( } return typeid_properties; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index a56bbc9a168..c49f5990c5b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Properties_Support.h @@ -20,6 +21,8 @@ #include "PG_Property_Set.h" #include "portablegroup_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -206,4 +209,6 @@ namespace TAO }; } //namespace TAO_PG +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_PG_PROPERTIES_SUPPORT_H diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index b09dc33d9de..57ca310be82 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableGroup, PG_PropertyManager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PG_PropertyManager::TAO_PG_PropertyManager ( TAO_PG_ObjectGroupManager & object_group_manager) : object_group_manager_ (object_group_manager), @@ -362,3 +364,5 @@ TAO_PG_PropertyManager::remove_properties ( // variable. properties = new_properties; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 7b748ac0d15..7fe33a7f00c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -30,6 +30,8 @@ #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_PG_ObjectGroupManager; @@ -183,6 +185,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 8e41ae574ca..82f8af77782 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ //============================================================================= /** * @file PG_Property_Set.cpp @@ -17,6 +16,8 @@ #include "PG_Property_Set.h" #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////// // PG_Property_Set @@ -25,7 +26,6 @@ TAO::PG_Property_Set::PG_Property_Set() { } - TAO::PG_Property_Set::PG_Property_Set ( const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL) @@ -351,3 +351,5 @@ int TAO_PG::test_encode_decode () return result; } #endif // PG_PS_UNIT_TEST + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 05c5f57f34b..043e7644b95 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Property_Set.h @@ -27,6 +28,8 @@ #include "ace/SString.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -186,6 +189,8 @@ namespace TAO #endif // PG_PS_UNIT_TEST } //namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + //////////////////////////////////// // include templated helper function #include "PG_Property_Set_Find.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h index b06794df571..9b28b1fc4ed 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Property_Set_Find.h @@ -24,6 +25,8 @@ #include "ace/Hash_Map_Manager.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -45,6 +48,8 @@ namespace TAO } //namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif // TAO_PG_PROPERTY_SET_FIND_H diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp index 895c5bc8ad3..49a4e08bfde 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableGroup, PG_Property_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Boolean TAO_PG::get_property_value (const PortableGroup::Name & property_name, const PortableGroup::Properties & properties, @@ -76,3 +78,5 @@ TAO_PG::override_properties ( } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index ca02b71a413..b7404c53c41 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -25,6 +25,7 @@ #include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { @@ -50,5 +51,7 @@ namespace TAO_PG } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index 78280b2e7af..acdaa982a50 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "GOA.h" #include "PG_Servant_Dispatcher.h" @@ -7,6 +7,8 @@ ACE_RCSID(PortableGroup, PG_Servant_Dispatcher, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void) { } @@ -40,24 +42,29 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, } void -TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (TAO_Root_POA &, - CORBA::Short, - TAO_ServerRequest &, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PG_Servant_Dispatcher::pre_invoke_remote_request ( + TAO_Root_POA &, + CORBA::Short, + TAO_ServerRequest &, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &, - CORBA::Short, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request ( + TAO_Root_POA &, + CORBA::Short, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_PG_Servant_Dispatcher::post_invoke (TAO_Root_POA &, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) +TAO_PG_Servant_Dispatcher::post_invoke ( + TAO_Root_POA &, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h index 2c40bef8cd3..ed26a3b980a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PG_Servant_Dispatcher * @@ -64,5 +66,7 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_SERVANT_DISPATCHER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index 58047cef329..988e0eff5dc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -13,6 +13,7 @@ ACE_RCSID (PortableGroup, PG_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -171,3 +172,5 @@ namespace TAO return cdr.good_bit (); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index f919cbbbba6..cd9af20cab9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file PG_Utils.h @@ -22,6 +23,8 @@ #include "portablegroup_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -50,7 +53,7 @@ namespace TAO }; } - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_PORTABLEGROUP_UTILS_H*/ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h index dcb0e3d5a5e..7f993ad8f71 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h @@ -24,6 +24,8 @@ #include "orbsvcs/PortableGroupC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits? /// The maximum number of object groups to be managed by the /// ObjectGroupManager. This number is also equal to the number of @@ -55,6 +57,8 @@ const PortableGroup::MinimumNumberMembersValue TAO_PG_MINIMUM_NUMBER_MEMBERS = TAO_PG_INITIAL_NUMBER_MEMBERS; #endif /* TAO_PG_MINIMUM_NUMBER_MEMBERS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PG_CONF_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index 9f09c2ebf34..fb657e5e881 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "PortableGroup_Acceptor_Registry.h" @@ -16,6 +14,8 @@ ACE_RCSID (PortableGroup, PortableGroup_Acceptor_Registry, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void) { } @@ -187,3 +187,5 @@ TAO_PortableGroup_Acceptor_Registry::find (const TAO_Profile* profile, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index 96262fb3835..4b8a1c87c15 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -30,6 +30,8 @@ #include "tao/Transport_Acceptor.h" #include "tao/Resource_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Profile; namespace CORBA @@ -108,10 +110,8 @@ private: Acceptor_Registry registry_; }; -//#if defined(__ACE_INLINE__) -//#include "tao/PortableGroup_Acceptor_Registry.i" -//#endif /* __ACE_INLINE__ */ - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" + #endif /* TAO_PORTABLEGROUP_ACCEPTOR_REGISTRY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 31e3782daeb..b2fb4c1aaf4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "PortableGroup_Loader.h" @@ -13,6 +11,9 @@ ACE_RCSID (PortableGroup, PortableGroup_Loader, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void) { } @@ -71,6 +72,8 @@ TAO_PortableGroup_Loader::Initializer (void) return -1; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader, ACE_TEXT ("PortableGroup_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index c30fa026c6b..6f67d8b8286 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -16,15 +16,20 @@ #define TAO_PORTABLEGROUP_LOADER_H #include /**/ "ace/pre.h" -#include "ace/Service_Config.h" + +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +#include "ace/Service_Config.h" #include "ace/Service_Object.h" -#include "portablegroup_export.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PortableGroup_Adapter @@ -49,13 +54,15 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader) -ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader) - static int TAO_Requires_PortableGroup_Initializer = TAO_PortableGroup_Loader::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader) +ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader) + #include /**/ "ace/post.h" #endif /* TAO_PORTABLEGROUP_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 29cace33f28..6ba92af8454 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -16,6 +16,8 @@ static const char pg_poa_factory_name[] = "TAO_PG_POA"; static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE( "TAO_PG_POA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", ""); +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_PortableGroup_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info @@ -65,3 +67,5 @@ TAO_PortableGroup_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 901e76e68d3..fa27eb6df7c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -32,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// PortableGroup ORB initializer. class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, @@ -48,6 +50,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index 3fb03e3841d..73c78597e50 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "UIPMC_Profile.h" @@ -13,6 +11,8 @@ ACE_RCSID (PortableGroup, PortableGroup_Request_Dispatcher, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void) { } @@ -57,3 +57,5 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index 0f0ae518206..11b2450218f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -24,6 +24,8 @@ #include "Portable_Group_Map.h" #include "PortableGroup_Acceptor_Registry.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class TAO_PortableGroup_Loader; @@ -61,6 +63,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLEGROUP_REQUEST_DISPATCHER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index c970a53bbee..631ae66e906 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -9,6 +9,7 @@ ACE_RCSID (PortableGroup, Portable_Group_Map, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. TAO_Portable_Group_Map::TAO_Portable_Group_Map () @@ -175,3 +176,5 @@ TAO_GroupId_Equal_To::operator () ( && lhs->object_group_id == rhs->object_group_id && lhs->object_group_ref_version == rhs->object_group_ref_version; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index 12ec9ee45a5..898e3663ff9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -28,6 +28,7 @@ #include "ace/Null_Mutex.h" #include "ace/Hash_Map_Manager_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServerRequest; @@ -128,6 +129,8 @@ protected: GroupId_Table map_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + //#if defined (__ACE_INLINE__) //# include "Portable_Group_Map.i" //#endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index a6b2bf50b8e..28162b3fded 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -22,6 +22,7 @@ ACE_RCSID (PortableGroup, UIPMC_Acceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (CORBA::Boolean /*flag*/) : TAO_Acceptor (TAO_TAG_UIPMC_PROFILE), @@ -347,3 +348,5 @@ TAO_UIPMC_Acceptor::parse_options (const char *str) } return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index 4022d3f4ec0..371feec959b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -32,6 +32,8 @@ #include "portablegroup_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO UIPMC_Acceptor concrete call defination /** @@ -148,6 +150,8 @@ private: TAO_UIPMC_Connection_Handler *connection_handler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "UIPMC_Acceptor.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i index 3bda9ea1fca..ec296d0f9b6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i @@ -1,6 +1,10 @@ // -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const ACE_INET_Addr& TAO_UIPMC_Acceptor::address (void) const { @@ -21,3 +25,5 @@ TAO_UIPMC_Acceptor::endpoints (void) return this->addrs_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 930e364b656..db49307c2b7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -23,6 +23,7 @@ ACE_RCSID(PortableGroup, UIPMC_Connection_Handler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t) : TAO_UIPMC_SVC_HANDLER (t, 0 , 0), @@ -262,3 +263,5 @@ TAO_UIPMC_Connection_Handler::add_transport_to_cache (void) .transport_cache ().cache_transport (&prop, this->transport ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index 0ea83fc2966..af548309afb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -32,6 +32,8 @@ #include "ace/SOCK_Dgram.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward Decls class TAO_Pluggable_Messaging; @@ -45,8 +47,6 @@ class TAO_Pluggable_Messaging; * The Connection handler which is common for the Acceptor and * the Connector */ - - class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : public TAO_UIPMC_SVC_HANDLER, public TAO_Connection_Handler @@ -143,5 +143,7 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UIPMC_CONNECTION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 370ff9fd142..d6d74ed8e6c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "UIPMC_Profile.h" @@ -14,9 +12,11 @@ #include "ace/Connector.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (tao, +ACE_RCSID (PortableGroup, UIPMC_Connector, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_UIPMC_Connector::TAO_UIPMC_Connector (CORBA::Boolean) : TAO_Connector (TAO_TAG_UIPMC_PROFILE) { @@ -181,15 +181,15 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint) if (!endpoint || !*endpoint) return -1; // Failure - const char *protocol[] = { "miop" }; + static const char protocol[] = "miop"; + static size_t const len = sizeof (protocol); - size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint; - size_t len0 = ACE_OS::strlen (protocol[0]); + size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint; // Check for the proper prefix in the IOR. If the proper prefix // isn't in the IOR then it is not an IOR we can use. - if (slot == len0 - && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0) + if (slot == len + && ACE_OS::strncasecmp (endpoint, protocol, len) == 0) return 0; return -1; @@ -205,14 +205,14 @@ TAO_UIPMC_Connector::object_key_delimiter (void) const int TAO_UIPMC_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) + TAO_Connection_Handler * /* svc_handler */) { - ACE_UNUSED_ARG(svc_handler); - // Noop return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash <ACE_INET_Addr>; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index b537b14a02c..49ef29f33a5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -28,6 +28,8 @@ #include "tao/Transport_Connector.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // **************************************************************** /** @@ -90,6 +92,8 @@ private: SvcHandlerIterator; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UIPMC_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index 04ef32df9ce..ebdc5a5f8df 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "UIPMC_Endpoint.h" @@ -20,6 +18,8 @@ ACE_RCSID (tao, # include "UIPMC_Endpoint.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void) : TAO_Endpoint (TAO_TAG_UIPMC_PROFILE), object_addr_ (), @@ -145,3 +145,5 @@ TAO_UIPMC_Endpoint::hash (void) return this->hash_val_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h index f7a23583d58..7988f5e29f7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h @@ -27,6 +27,8 @@ #include "portablegroup_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_UIPMC_Endpoint * @@ -116,6 +118,8 @@ private: TAO_UIPMC_Endpoint *next_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "UIPMC_Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i index c89f5618806..7d91cc4d459 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i @@ -1,6 +1,9 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const ACE_INET_Addr & TAO_UIPMC_Endpoint::object_addr (void) const { @@ -46,3 +49,4 @@ TAO_UIPMC_Endpoint::update_object_addr (void) this->uint_ip_addr ()); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index ba2accd9ff2..d899a094059 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "UIPMC_Factory.h" @@ -11,7 +9,9 @@ ACE_RCSID (PortableGroup, UIPMC_Factory, "$Id$") -static const char prefix_[] = "uipmc"; +static const char the_prefix[] = "uipmc"; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_UIPMC_PROFILE), @@ -28,13 +28,13 @@ int TAO_UIPMC_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_UIPMC_Protocol_Factory::prefix (void) const { - return ::prefix_; + return ::the_prefix; } char @@ -85,6 +85,8 @@ TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_UIPMC_Protocol_Factory, ACE_TEXT ("UIPMC_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index 8696202441d..9b64f04ba6c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -25,6 +25,8 @@ #include "portablegroup_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Acceptor; class TAO_Connector; @@ -60,6 +62,8 @@ private: int minor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_UIPMC_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_UIPMC_Protocol_Factory) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp index 2f8473c5a73..553df62769e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp @@ -2,6 +2,8 @@ #include "UIPMC_Message_Block_Data_Iterator.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + UIPMC_Message_Block_Data_Iterator::UIPMC_Message_Block_Data_Iterator (iovec *iov, int iovcnt) : iov_ (iov), iovcnt_ (iovcnt), @@ -83,3 +85,5 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h index 3f28eb5e7c6..0378e1aac7c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class UIPMC_Message_Block_Data_Iterator * @@ -60,5 +64,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UIPMC_MESSAGE_BLOCK_DATA_ITERATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 8c1cfd4af4f..ee4aa503146 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "UIPMC_Profile.h" @@ -19,12 +17,14 @@ ACE_RCSID (PortableGroup, UIPMC_Profile, "$Id$") -static const char prefix_[] = "uipmc"; +static const char the_prefix[] = "uipmc"; // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target // specification. static const CORBA::Short default_addressing_mode_ = TAO_Target_Specification::Profile_Addr; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const char TAO_UIPMC_Profile::object_key_delimiter_ = '/'; char @@ -398,7 +398,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ Frank: Update to pull out GroupID information... - size_t buflen = (ACE_OS::strlen (::prefix_) + + size_t buflen = (ACE_OS::strlen (::the_prefix) + 3 /* "loc" */ + 1 /* colon separator */ + 2 /* double-slash separator */ + @@ -414,7 +414,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s://1.0@%s:%d", - ::prefix_, + ::the_prefix, this->endpoint_.get_host_addr (), this->endpoint_.port ()); return buf; @@ -423,7 +423,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_UIPMC_Profile::prefix (void) { - return ::prefix_; + return ::the_prefix; } IOP::TaggedProfile & @@ -742,3 +742,5 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index 3b5ee25dc3a..263b6391cef 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -33,6 +33,7 @@ #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO UIPMC_Profile concrete Profile definitions /** @@ -153,5 +154,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UIPMC_PROFILE_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index ea424e9816c..e55f36b7032 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // $Id$ #include "UIPMC_Profile.h" @@ -59,6 +58,8 @@ ACE_RCSID (PortableGroup, static const CORBA::Octet miop_magic[4] = { 0x4d, 0x49, 0x4f, 0x50 }; // 'M', 'I', 'O', 'P' +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + struct MIOP_Packet { iovec iov[ACE_IOV_MAX]; @@ -66,6 +67,7 @@ struct MIOP_Packet int length; }; + TAO_UIPMC_Transport::TAO_UIPMC_Transport (TAO_UIPMC_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean /*flag*/) @@ -586,8 +588,6 @@ TAO_UIPMC_Transport::send_message (TAO_OutputCDR &stream, return 1; } - - int TAO_UIPMC_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) @@ -596,3 +596,5 @@ TAO_UIPMC_Transport::messaging_init (CORBA::Octet major, minor); return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index 164e8991e51..f887f1dfedf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -25,6 +25,8 @@ #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward decls. class TAO_UIPMC_Connection_Handler; class TAO_ORB_Core; @@ -123,5 +125,7 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UIPMC_TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp index a640656a52a..13b3556e6db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp @@ -7,6 +7,8 @@ ACE_RCSID(tao, Wait_On_Leader_Follower, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport) : TAO_Wait_Strategy (transport) { @@ -47,3 +49,5 @@ TAO_UIPMC_Wait_Never::wait (ACE_Time_Value *, { return -1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index 799d09e2e64..fb688c28951 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "portablegroup_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_UIPMC_Wait_Never * @@ -50,5 +52,7 @@ public: virtual bool can_process_upcalls (void) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UIPMC_WAIT_NEVER_H */ |