diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-08 19:22:45 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-08 19:22:45 +0000 |
| commit | 6806fe87dadc17901b3fdf0a24cc8740fb6ac897 (patch) | |
| tree | f608527a9e65d8dfcc73eb5dfa7250871edee572 /TAO | |
| parent | 9d5dd2661b0a939d6ea86803bff793961ee028cc (diff) | |
| download | ATCD-6806fe87dadc17901b3fdf0a24cc8740fb6ac897.tar.gz | |
ChangeLogTag: Wed Sep 8 12:15:18 2004 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
149 files changed, 585 insertions, 304 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 69ace8d59b2..ed50e6687df 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,164 @@ +Wed Sep 8 12:15:18 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h: + * orbsvcs/orbsvcs/Naming/Entries.h: + * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h: + * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Loader.h: + * orbsvcs/orbsvcs/Naming/Naming_Server.h: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h: + * orbsvcs/orbsvcs/Naming/Persistent_Entries.h: + * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h: + * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h: + * orbsvcs/orbsvcs/Notify/Admin.h: + * orbsvcs/orbsvcs/Notify/AdminProperties.h: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h: + * orbsvcs/orbsvcs/Notify/Builder.h: + * orbsvcs/orbsvcs/Notify/Consumer.h: + * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h: + * orbsvcs/orbsvcs/Notify/Consumer_Map.h: + * orbsvcs/orbsvcs/Notify/Container_T.h: + * 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/ETCL_Filter.h: + * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp: + * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h: + * orbsvcs/orbsvcs/Notify/Event.h: + * orbsvcs/orbsvcs/Notify/EventChannel.h: + * orbsvcs/orbsvcs/Notify/EventChannelFactory.h: + * orbsvcs/orbsvcs/Notify/EventType.h: + * orbsvcs/orbsvcs/Notify/EventTypeSeq.h: + * orbsvcs/orbsvcs/Notify/Event_Manager.h: + * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h: + * orbsvcs/orbsvcs/Notify/Event_Map_T.h: + * orbsvcs/orbsvcs/Notify/Factory.h: + * orbsvcs/orbsvcs/Notify/FilterAdmin.h: + * orbsvcs/orbsvcs/Notify/FilterFactory.h: + * orbsvcs/orbsvcs/Notify/Find_Worker_T.h: + * orbsvcs/orbsvcs/Notify/ID_Factory.h: + * orbsvcs/orbsvcs/Notify/Method_Request.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Event.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h: + * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h: + * orbsvcs/orbsvcs/Notify/Notify_Extensions.h: + * orbsvcs/orbsvcs/Notify/Object.h: + * orbsvcs/orbsvcs/Notify/POA_Helper.h: + * orbsvcs/orbsvcs/Notify/Peer.h: + * orbsvcs/orbsvcs/Notify/Properties.h: + * orbsvcs/orbsvcs/Notify/Property.h: + * orbsvcs/orbsvcs/Notify/PropertySeq.h: + * orbsvcs/orbsvcs/Notify/Property_Boolean.h: + * orbsvcs/orbsvcs/Notify/Property_T.h: + * orbsvcs/orbsvcs/Notify/Proxy.h: + * orbsvcs/orbsvcs/Notify/ProxyConsumer.h: + * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h: + * orbsvcs/orbsvcs/Notify/ProxySupplier.h: + * orbsvcs/orbsvcs/Notify/ProxySupplier_T.h: + * orbsvcs/orbsvcs/Notify/Proxy_T.h: + * orbsvcs/orbsvcs/Notify/QoSProperties.h: + * orbsvcs/orbsvcs/Notify/Reactive_Task.h: + * orbsvcs/orbsvcs/Notify/Refcountable.h: + * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h: + * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h: + * orbsvcs/orbsvcs/Notify/Service.h: + * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h: + * orbsvcs/orbsvcs/Notify/Supplier.h: + * orbsvcs/orbsvcs/Notify/SupplierAdmin.h: + * orbsvcs/orbsvcs/Notify/Supplier_Map.h: + * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h: + * orbsvcs/orbsvcs/Notify/Timer.h: + * orbsvcs/orbsvcs/Notify/Timer_Queue.h: + * orbsvcs/orbsvcs/Notify/Timer_Reactor.h: + * orbsvcs/orbsvcs/Notify/Worker_Task.h: + * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h: + * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h: + * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h: + * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h: + * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h: + * orbsvcs/orbsvcs/Trader/Interpreter.h: + * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h: + * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h: + * orbsvcs/orbsvcs/Trader/Trader.h: + * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h: + * orbsvcs/orbsvcs/Trader/Trader_Utils.h: + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: + * orbsvcs/orbsvcs/Trader/Trading_Loader.h: + + Changed #include "*_export.h" to "*_serv_export.h"; Renamed + TAO_*_Export to TAO_*_Serv_Export. + + * orbsvcs/orbsvcs/CosEvent/event_serv_export.h: + * orbsvcs/orbsvcs/Naming/naming_serv_export.h: + * orbsvcs/orbsvcs/Notify/notify_serv_export.h: + * orbsvcs/orbsvcs/Trader/trading_serv_export.h: + + New files. + + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + + Changed to use different export macros service implementations. + Wed Sep 8 11:03:47 2004 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/CosEvent/event_skel_export.h: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 37aa928c936..0cb044596ac 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -59,7 +59,7 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, svc_utils { sharedname = TAO_CosEvent_Serv - dynamicflags = TAO_EVENT_BUILD_DLL + dynamicflags = TAO_EVENT_SERV_BUILD_DLL tagchecks += CosEvent IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 0df20092960..980431bedbb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -25,7 +25,7 @@ #include "CEC_ProxyPushSupplier.h" #include "CEC_ProxyPullSupplier.h" -#include "event_export.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; @@ -45,7 +45,7 @@ class TAO_CEC_EventChannel; * externally. * = TODO */ -class TAO_Event_Export TAO_CEC_ConsumerAdmin +class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin : public POA_CosEventChannelAdmin::ConsumerAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index b5551777638..f3a405d26c7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; @@ -44,7 +44,7 @@ namespace CORBA * = LOCKING * = TODO */ -class TAO_Event_Export TAO_CEC_ConsumerControl +class TAO_Event_Serv_Export TAO_CEC_ConsumerControl { public: /// Constructor. It does not assume ownership of the <event_channel> diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 65be6d15fb8..6be89cac48a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1324,7 +1324,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory, &ACE_SVC_NAME (TAO_CEC_Default_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Default_Factory) +ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Default_Factory) // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index c6d0a5d3627..d314e1785ca 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -38,7 +38,7 @@ * set in the service configurator file. * = MEMORY MANAGMENT */ -class TAO_Event_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory +class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory { public: /// Constructor @@ -209,7 +209,7 @@ private: #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory) -ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Default_Factory) +ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Default_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 1efbdfb9695..a6ba0f8a724 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -18,7 +18,7 @@ #include "orbsvcs/CosEventCommC.h" -#include "event_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ class TAO_CEC_TypedEvent; * for each queue or can simply push the event to the consumer in * FIFO order. */ -class TAO_Event_Export TAO_CEC_Dispatching +class TAO_Event_Serv_Export TAO_CEC_Dispatching { public: /// destructor... @@ -84,7 +84,7 @@ public: * The events are dispatched in FIFO ordering, using the invoking * thread to push the event to the consumer. */ -class TAO_Event_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispatching +class TAO_Event_Serv_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispatching { public: /// The scheduler is used to find the range of priorities and similar diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 138e22d052f..fe5b698b592 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -28,7 +28,7 @@ #include "tao/Basic_Types.h" #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_serv_export.h" #include "CEC_ProxyPushSupplier.h" @@ -43,7 +43,7 @@ * dispatching. * */ -class TAO_Event_Export TAO_CEC_Dispatching_Task : public ACE_Task<ACE_SYNCH> +class TAO_Event_Serv_Export TAO_CEC_Dispatching_Task : public ACE_Task<ACE_SYNCH> { public: /// Constructor @@ -72,7 +72,7 @@ private: // **************************************************************** -class TAO_Event_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block +class TAO_Event_Serv_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block { public: /// Constructor, it will allocate its own data block @@ -91,7 +91,7 @@ public: // **************************************************************** -class TAO_Event_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispatch_Command +class TAO_Event_Serv_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispatch_Command { public: /// Constructor @@ -103,7 +103,7 @@ public: // **************************************************************** -class TAO_Event_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Command +class TAO_Event_Serv_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Command { public: /// Constructor @@ -129,7 +129,7 @@ private: // **************************************************************** #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -class TAO_Event_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Command +class TAO_Event_Serv_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Command { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index ff5e80073d9..55f9282abe2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -29,7 +29,7 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "CEC_Defaults.h" -#include "event_export.h" +#include "event_serv_export.h" #include "ace/Hash_Map_Manager.h" /** @@ -48,7 +48,7 @@ * an easy mechanism to extend the attributes without requiring * changes in the EC constructor. */ -class TAO_Event_Export TAO_CEC_EventChannel_Attributes +class TAO_Event_Serv_Export TAO_CEC_EventChannel_Attributes { public: /** @@ -98,7 +98,7 @@ private: * ConsumerAdmin and Dispatching) and to provide a simpler * interface to the CEC_Factory. */ -class TAO_Event_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdmin::EventChannel +class TAO_Event_Serv_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdmin::EventChannel { public: class ServantBaseHash diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 1e6e01dc679..78f11357d3e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -459,7 +459,7 @@ TAO_CEC_Event_Loader::fini (void) return 0; } -ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Event_Loader) +ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_CEC_Event_Loader>; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 9c5e6aae45a..d48c98c3705 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -32,7 +32,7 @@ * * @brief Dynamically load an instance of the COS Event Service. */ -class TAO_Event_Export TAO_CEC_Event_Loader : public TAO_Object_Loader +class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader { public: /// Constructor @@ -98,6 +98,6 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &)) }; -ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Event_Loader) +ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader) #endif /* TAO_CEC_EVENT_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index 248ef824c76..7161eb63dfd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -22,7 +22,7 @@ #include "tao/Objref_VarOut_T.h" -#include "event_export.h" +#include "event_serv_export.h" class ACE_Lock; @@ -70,7 +70,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSup * Some implementations may require a different instance for the * CEC_Factory for each instance of a CEC_EventChannel. */ -class TAO_Event_Export TAO_CEC_Factory : public ACE_Service_Object +class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object { public: /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index ba779b69f40..d3a706ff5b8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -34,7 +34,7 @@ class TAO_CEC_EventChannel; * threads. It's main purpose is to decouple the suppliers from * the client execution time, specially in the collocated case. */ -class TAO_Event_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching +class TAO_Event_Serv_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 30e6d89e8f1..35fae60d38e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Worker.h" -#include "event_export.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; @@ -41,7 +41,7 @@ class TAO_CEC_ProxyPullSupplier; * The object commits suicide when disconnect_pull_consumer() is * called. */ -class TAO_Event_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer +class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer { public: typedef CosEventChannelAdmin::ProxyPullConsumer_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index e2e399a2aa4..1f7a0a603d4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -26,7 +26,7 @@ #include "ace/Condition_Thread_Mutex.h" #include "ace/Unbounded_Queue.h" -#include "event_export.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPullConsumer; @@ -48,7 +48,7 @@ class TAO_CEC_ProxyPullConsumer; * Locking is strategized, the event channel acts as a factory for * the locking strategies. */ -class TAO_Event_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier +class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier { public: typedef CosEventChannelAdmin::ProxyPullSupplier_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index fbe592a3bc4..d16697cb4bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" -#include "event_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -41,7 +41,7 @@ class TAO_CEC_ProxyPushSupplier; * The object commits suicide when disconnect_push_consumer() is * called. */ -class TAO_Event_Export TAO_CEC_ProxyPushConsumer +class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer : public POA_CosEventChannelAdmin::ProxyPushConsumer { public: @@ -151,7 +151,7 @@ private: * the reference count on the proxy, eliminating the need to hold * mutexes during long operations. */ -class TAO_Event_Export TAO_CEC_ProxyPushConsumer_Guard +class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer_Guard { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 48357020537..1e05d9e7e41 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -22,7 +22,7 @@ #include "orbsvcs/CosTypedEventChannelAdminS.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "event_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -52,7 +52,7 @@ class TAO_CEC_TypedEventChannel; * Locking is strategized, the event channel acts as a factory for * the locking strategies. */ -class TAO_Event_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdmin::ProxyPushSupplier +class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdmin::ProxyPushSupplier { public: typedef CosEventChannelAdmin::ProxyPushSupplier_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 9668fb7418a..b4c0c970545 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -23,7 +23,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_serv_export.h" /** * @class TAO_CEC_Pulling_Strategy @@ -36,7 +36,7 @@ * for each queue or can simply push the event to the consumer in * FIFO order. */ -class TAO_Event_Export TAO_CEC_Pulling_Strategy +class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy { public: /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 16ed8e56346..43994062fd0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -48,7 +48,7 @@ class TAO_CEC_TypedEventChannel; * periodically wakeup and verify the state of the consumers * registered with the Event Channel. */ -class TAO_Event_Export TAO_CEC_ConsumerControl_Adapter : public ACE_Event_Handler +class TAO_Event_Serv_Export TAO_CEC_ConsumerControl_Adapter : public ACE_Event_Handler { public: /// Constructor @@ -74,7 +74,7 @@ private: * = LOCKING * = TODO */ -class TAO_Event_Export TAO_CEC_Reactive_ConsumerControl +class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl : public TAO_CEC_ConsumerControl { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index 6715203f3d8..0ee810190e2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -43,7 +43,7 @@ class TAO_CEC_Reactive_Pulling_Strategy; * periodically wakeup and try top pull events from each * PullSupplier connected to the EventChannel. */ -class TAO_Event_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler +class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler { public: /// Constructor @@ -68,7 +68,7 @@ private: * The events are dispatched in FIFO ordering, using the invoking * thread to push the event to the consumer. */ -class TAO_Event_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy +class TAO_Event_Serv_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy { public: /// The scheduler is used to find the range of priorities and similar diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 435276a79ba..bede8d09893 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -47,7 +47,7 @@ class TAO_CEC_TypedEventChannel; * periodically wakeup and verify the state of the suppliers * registered with the Event Channel. */ -class TAO_Event_Export TAO_CEC_SupplierControl_Adapter +class TAO_Event_Serv_Export TAO_CEC_SupplierControl_Adapter : public ACE_Event_Handler { public: @@ -74,7 +74,7 @@ private: * = LOCKING * = TODO */ -class TAO_Event_Export TAO_CEC_Reactive_SupplierControl +class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl : public TAO_CEC_SupplierControl { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index e78cd342550..38f312bdc53 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -29,7 +29,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" -#include "event_export.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; @@ -49,7 +49,7 @@ class TAO_CEC_EventChannel; * externally. * = TODO */ -class TAO_Event_Export TAO_CEC_SupplierAdmin +class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin : public POA_CosEventChannelAdmin::SupplierAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 744d3fa827c..7875e543f34 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -29,7 +29,7 @@ #include "tao/PortableServer/PortableServerC.h" #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; @@ -55,7 +55,7 @@ namespace CORBA * = LOCKING * = TODO */ -class TAO_Event_Export TAO_CEC_SupplierControl +class TAO_Event_Serv_Export TAO_CEC_SupplierControl { public: /// Constructor. It does not assume ownership of the <event_channel> diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index aaa087d19a9..1e08da77de5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -30,7 +30,7 @@ class TAO_CEC_TypedEventChannel; //Class TAO_CEC_TypedConsumerAdmin -class TAO_Event_Export TAO_CEC_TypedConsumerAdmin +class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin : public POA_CosTypedEventChannelAdmin::TypedConsumerAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index 3eac4f3f572..d0ee1cfa917 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -12,7 +12,7 @@ #define TAO_CEC_TYPEDEVENT_H_ #include /**/ "ace/pre.h" -#include "event_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -34,7 +34,7 @@ class TAO_CEC_ProxyPushSupplier; -class TAO_Event_Export TAO_CEC_TypedEvent +class TAO_Event_Serv_Export TAO_CEC_TypedEvent { public: /// constructors... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 64bcbbb9c6b..1119ef34170 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "CEC_Defaults.h" -#include "event_export.h" +#include "event_serv_export.h" #include "orbsvcs/CosTypedEventChannelAdminS.h" @@ -50,7 +50,7 @@ * an easy mechanism to extend the attributes without requiring * changes in the EC constructor. */ -class TAO_Event_Export TAO_CEC_TypedEventChannel_Attributes +class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel_Attributes { public: /** @@ -105,7 +105,7 @@ private: class TAO_CEC_Operation_Params; //Class TAO_CEC_TypedEventChannel -class TAO_Event_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEventChannelAdmin::TypedEventChannel +class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEventChannelAdmin::TypedEventChannel { public: @@ -322,7 +322,7 @@ private: }; -class TAO_Event_Export TAO_CEC_Param +class TAO_Event_Serv_Export TAO_CEC_Param { public: /// Constructor @@ -341,7 +341,7 @@ private: }; -class TAO_Event_Export TAO_CEC_Operation_Params +class TAO_Event_Serv_Export TAO_CEC_Operation_Params { /// constructor TAO_CEC_Operation_Params (CORBA::ULong num_params); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 4ee4b165b65..f9fb357633e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -29,7 +29,7 @@ class TAO_CEC_TypedEventChannel; class TAO_CEC_DynamicImplementationServer; //Class TAO_CEC_TypedProxyPushConsumer -class TAO_Event_Export TAO_CEC_TypedProxyPushConsumer +class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer : public virtual POA_CosTypedEventChannelAdmin::TypedProxyPushConsumer { public: @@ -147,7 +147,7 @@ private: * the reference count on the proxy, eliminating the need to hold * mutexes during long operations. */ -class TAO_Event_Export TAO_CEC_TypedProxyPushConsumer_Guard +class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer_Guard { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 9d55ac7dd1c..ac42bd0ca8b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -32,7 +32,7 @@ class TAO_CEC_TypedEventChannel; //Class TAO_CEC_TypedSupplierAdmin -class TAO_Event_Export TAO_CEC_TypedSupplierAdmin +class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin : public POA_CosTypedEventChannelAdmin::TypedSupplierAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index c1701b88b70..e0afb1f5e4b 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -55,7 +55,7 @@ project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver { project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, iortable { sharedname = TAO_CosNaming_Serv - dynamicflags = TAO_NAMING_BUILD_DLL + dynamicflags = TAO_NAMING_SERV_BUILD_DLL tagchecks += Naming IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index e2dea5735b3..7422ce4e885 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -89,7 +89,7 @@ project(CosNotification_Skel) : orbsvcslib, core, notification, portableserver { project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, etcl { sharedname = TAO_CosNotification_Serv - dynamicflags = TAO_NOTIFY_BUILD_DLL + dynamicflags = TAO_NOTIFY_SERV_BUILD_DLL tagchecks += Notify IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 35d0e61ca17..ad5a4009aed 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -67,7 +67,7 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils { sharedname = TAO_CosTrading_Serv - dynamicflags = TAO_TRADING_BUILD_DLL + dynamicflags = TAO_TRADING_SERV_BUILD_DLL tagchecks += Trader pch_header = pch_source = diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 4fc1f6b85ef..26f4d5703b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -24,7 +24,7 @@ #include "ace/SString.h" #include "orbsvcs/CosNamingC.h" -#include "naming_export.h" +#include "naming_serv_export.h" /** * @class TAO_IntId @@ -38,7 +38,7 @@ * they can be stored together as a <value> for a <key> in a * hash table holding the state of a Transient Naming Context. */ -class TAO_Naming_Export TAO_IntId +class TAO_Naming_Serv_Export TAO_IntId { public: // = Initialization and termination methods. @@ -79,7 +79,7 @@ public: * they can be stored together as a <key> for a <value> in a * hash table holding the state of a Transient Naming Context. */ -class TAO_Naming_Export TAO_ExtId +class TAO_Naming_Serv_Export TAO_ExtId { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index e8679086071..d3853190a0c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "Naming_Context_Interface.h" -#include "naming_export.h" +#include "naming_serv_export.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/SString.h" @@ -46,7 +46,7 @@ * that we can write some code that would work with any of them, * i.e., TAO_Hash_Naming_Context. */ -class TAO_Naming_Export TAO_Bindings_Map +class TAO_Naming_Serv_Export TAO_Bindings_Map { public: @@ -111,7 +111,7 @@ public: * class TAO_Bindings_Map, which provides a common interface to the data structures * used in TAO_Persistent_Namng_Context and TAO_Transient_Naming_Context. */ -class TAO_Naming_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl +class TAO_Naming_Serv_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index f113da90784..d3b4db2c3bd 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -17,7 +17,7 @@ #include "orbsvcs/CosNamingS.h" -#include "naming_export.h" +#include "naming_serv_export.h" #include "ace/Null_Mutex.h" class TAO_Naming_Context_Impl; @@ -41,7 +41,7 @@ class TAO_Naming_Context_Impl; * concrete implementors. */ -class TAO_Naming_Export TAO_Naming_Context : +class TAO_Naming_Serv_Export TAO_Naming_Context : public virtual PortableServer::RefCountServantBase, public virtual POA_CosNaming::NamingContextExt { @@ -304,7 +304,7 @@ protected: * Subclasses of TAO_Naming_Context_Impl provide concrete * implementations of the NamingContext functionality. */ -class TAO_Naming_Export TAO_Naming_Context_Impl +class TAO_Naming_Serv_Export TAO_Naming_Context_Impl { public: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index c2cb0964d12..a5eee0e0f33 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -90,7 +90,7 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, return 0; } -ACE_FACTORY_DEFINE (TAO_Naming, TAO_Naming_Loader) +ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_Naming_Loader>; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 2f97f05422d..4e34848a46d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -24,7 +24,7 @@ #include "orbsvcs/Naming/Naming_Server.h" -class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader +class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader { public: @@ -60,6 +60,6 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader &operator = (const TAO_Naming_Loader &)) }; -ACE_FACTORY_DECLARE (TAO_Naming, TAO_Naming_Loader) +ACE_FACTORY_DECLARE (TAO_Naming_Serv, TAO_Naming_Loader) #endif /* TAO_NAMING_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index aa013572580..5305864a809 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -57,7 +57,7 @@ class TAO_Storable_Naming_Context_Activator; * orbsvcs/orbsvcs/TAO_IOR_Multicast.*, implementation of * <resolve_initial_references>, and orbsvcs/Naming/README. */ -class TAO_Naming_Export TAO_Naming_Server +class TAO_Naming_Serv_Export TAO_Naming_Server { public: /// Default constructor. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index c343a0ba7d0..b97f3469164 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "Persistent_Entries.h" -#include "naming_export.h" +#include "naming_serv_export.h" #include "nsconf.h" #include "tao/PortableServer/PortableServer.h" @@ -41,7 +41,7 @@ * facilitates Persistent Naming Context servant initialization * upon Naming Server start-up. */ -class TAO_Naming_Export TAO_Persistent_Context_Index +class TAO_Naming_Serv_Export TAO_Persistent_Context_Index { public: // = Some typedefs for convenience. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index 91a5aa17e10..59a65b3dd85 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -17,7 +17,7 @@ #include "ace/Hash_Map_With_Allocator_T.h" #include "orbsvcs/CosNamingC.h" -#include "naming_export.h" +#include "naming_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * Memory for the ior isn't allocated/deallocated, this class just * copies a pointer. */ -class TAO_Naming_Export TAO_Persistent_IntId +class TAO_Naming_Serv_Export TAO_Persistent_IntId { public: // = Initialization and termination methods. @@ -80,7 +80,7 @@ public: * Memory for id and kind isn't allocated/deallocated, this * class just copies pointers. */ -class TAO_Naming_Export TAO_Persistent_ExtId +class TAO_Naming_Serv_Export TAO_Persistent_ExtId { public: // = Initialization and termination methods. @@ -142,7 +142,7 @@ public: * they can be stored together as a <value> for a <key> in a * hash table holding the state of a Persistent Context Index. */ -class TAO_Naming_Export TAO_Persistent_Index_IntId +class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId { public: // = Initialization and termination methods. @@ -186,7 +186,7 @@ public: * provide <hash> function for it to work with * ACE_Hash_Map_Manager. */ -class TAO_Naming_Export TAO_Persistent_Index_ExtId +class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index 2b98c6f524f..d3baab97b89 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -16,7 +16,7 @@ #include "Hash_Naming_Context.h" #include "Persistent_Entries.h" -#include "naming_export.h" +#include "naming_serv_export.h" /** * @class TAO_Persistent_Bindings_Map @@ -29,7 +29,7 @@ * from persistent storage) to make bindings persistent and * supports TAO_Bindings_Map interface. Used by TAO_Persistent_Naming_Context. */ -class TAO_Naming_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map { public: @@ -157,7 +157,7 @@ class TAO_Persistent_Context_Index; * process boundaries. Derives from TAO_Hash_Naming_Context and * uses TAO_Persistent_Bindings_Map to store name to object bindings. */ -class TAO_Naming_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context +class TAO_Naming_Serv_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context { public: /// Underlying data structure - typedef for ease of use. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index fcc2b416ee5..a8d6c62f634 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_Naming_Export TAO_Storable_IntId +class TAO_Naming_Serv_Export TAO_Storable_IntId { public: // = Initialization and termination methods. @@ -52,7 +52,7 @@ public: CosNaming::BindingType type_; }; -class TAO_Naming_Export TAO_Storable_ExtId +class TAO_Naming_Serv_Export TAO_Storable_ExtId { public: // = Initialization and termination methods. @@ -113,7 +113,7 @@ public: * A thin wrapper on top of ACE_Hash_Map_Manager. Supports * TAO_Bindings_Map interface. Used by TAO_Transient_Naming_Context. */ -class TAO_Naming_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map { public: @@ -213,7 +213,7 @@ private: * TAO_Hash_Naming_Context and uses TAO_Storable_Bindings_Map to * store name to object bindings. */ -class TAO_Naming_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context +class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context { public: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index 1c8fbe052fa..c761c23661e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -22,7 +22,7 @@ #if (TAO_HAS_MINIMUM_POA == 0) -#include "naming_export.h" +#include "naming_serv_export.h" class TAO_Naming_Service_Persistence_Factory; @@ -32,7 +32,7 @@ class TAO_Naming_Service_Persistence_Factory; * "lazily" created on demand in other processes by reading the * context file off disk only when a request to the context is made. */ -class TAO_Naming_Export TAO_Storable_Naming_Context_Activator : +class TAO_Naming_Serv_Export TAO_Storable_Naming_Context_Activator : public virtual PortableServer::ServantActivator { public: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index a4bfdca61d0..94ba088fb30 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -31,7 +31,7 @@ * A thin wrapper on top of ACE_Hash_Map_Manager. Supports * TAO_Bindings_Map interface. Used by TAO_Transient_Naming_Context. */ -class TAO_Naming_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Serv_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map { public: @@ -126,7 +126,7 @@ private: * TAO_Hash_Naming_Context and uses TAO_Transient_Bindings_Map to * store name to object bindings. */ -class TAO_Naming_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context +class TAO_Naming_Serv_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context { public: diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h new file mode 100644 index 00000000000..220b76294f0 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_NAMING_SERV_EXPORT_H +#define TAO_NAMING_SERV_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_NAMING_SERV_HAS_DLL) +# define TAO_NAMING_SERV_HAS_DLL 0 +# endif /* ! TAO_NAMING_SERV_HAS_DLL */ +#else +# if !defined (TAO_NAMING_SERV_HAS_DLL) +# define TAO_NAMING_SERV_HAS_DLL 1 +# endif /* ! TAO_NAMING_SERV_HAS_DLL */ +#endif + +#if defined (TAO_NAMING_SERV_HAS_DLL) && (TAO_NAMING_SERV_HAS_DLL == 1) +# if defined (TAO_NAMING_SERV_BUILD_DLL) +# define TAO_Naming_Serv_Export ACE_Proper_Export_Flag +# define TAO_NAMING_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_NAMING_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_NAMING_SERV_BUILD_DLL */ +# define TAO_Naming_Serv_Export ACE_Proper_Import_Flag +# define TAO_NAMING_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_NAMING_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_NAMING_SERV_BUILD_DLL */ +#else /* TAO_NAMING_SERV_HAS_DLL == 1 */ +# define TAO_Naming_Serv_Export +# define TAO_NAMING_SERV_SINGLETON_DECLARATION(T) +# define TAO_NAMING_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_NAMING_SERV_HAS_DLL == 1 */ + +#endif /* TAO_NAMING_SERV_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index f26fd54b02d..c2c384df821 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +35,7 @@ template <class TYPE> class TAO_Notify_Container_T; * */ -class TAO_Notify_Export TAO_Notify_Admin : public virtual TAO_Notify_Object +class TAO_Notify_Serv_Export TAO_Notify_Admin : public virtual TAO_Notify_Object { friend class TAO_Notify_Builder; public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index dada530013a..e7f51ebc5a0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * @brief The AdminProperties per EventChannel. * */ -class TAO_Notify_Export TAO_Notify_AdminProperties +class TAO_Notify_Serv_Export TAO_Notify_AdminProperties : public TAO_Notify_PropertySeq { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index 6ca5f07e18c..d97e7bc2b7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -33,7 +33,7 @@ class TAO_Notify_Consumer; * @brief * */ -class TAO_Notify_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event +class TAO_Notify_Serv_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event { friend class TAO_Notify_Builder; public: @@ -85,7 +85,7 @@ protected: * @brief AnyEvent implementation. * */ -class TAO_Notify_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy +class TAO_Notify_Serv_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index 0d115c82f31..7cb9b02f115 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushConsumer +class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index b84edf1d5ed..69acbdcdacc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -32,7 +32,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -42,7 +42,7 @@ TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; * @brief * */ -class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier +class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 5df73af9779..6c732c772ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -36,7 +36,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_ProxyPushConsumer +class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T < POA_CosNotifyChannelAdmin::ProxyPushConsumer > diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index b4f18be42f9..c24668ef7e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -33,7 +33,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>; * @brief * */ -class TAO_Notify_Export TAO_Notify_ProxyPushSupplier +class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index 98e48b52381..f5ca3aa8af9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -28,7 +28,7 @@ * @brief Wrapper for the PushConsumer that connect to the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer +class TAO_Notify_Serv_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 8cdf891d598..9f9ab07131e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -31,7 +31,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the PushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Serv_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index b60ed0ce9b0..fb2bdc4627c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Notify_Message_Queue; * @brief Base Strategy to enqueue and dequeue items from a Message Queue. * */ -class TAO_Notify_Export TAO_Notify_Buffering_Strategy +class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index e42cc2ad59f..bcf5abd6bec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ class TAO_Notify_Object; * @brief Helper class to create and activate CORBA objects. * */ -class TAO_Notify_Export TAO_Notify_Builder +class TAO_Notify_Serv_Export TAO_Notify_Builder { public: TAO_Notify_Builder (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 9b18e9335e7..bac8a0cbded 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +35,7 @@ class TAO_Notify_Proxy; * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel * */ -class TAO_Notify_Export TAO_Notify_Consumer : public TAO_Notify_Peer +class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 0f41aaa9f68..99964a7cd11 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * @brief Implementation of CosNotifyChannelAdmin::ConsumerAdmin * */ -class TAO_Notify_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin +class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin , public virtual TAO_Notify_Admin { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h index ce37ae65180..7a296f0d5b5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 23604de6421..6713775b023 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * */ template <class TYPE> -class TAO_Notify_Export TAO_Notify_Container_T +class TAO_Notify_Serv_Export TAO_Notify_Container_T { typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h index 323ce71551c..5dccf6d8084 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h @@ -13,7 +13,7 @@ #define TAO_Notify_COSNOTIFY_INITIALIZER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ * @brief Helper to load the Cos Notification service into the service conf. for static links. * */ -class TAO_Notify_Export TAO_Notify_CosNotify_Initializer +class TAO_Notify_Serv_Export TAO_Notify_CosNotify_Initializer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 42d441b8513..4fcfbe8081e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -260,7 +260,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CosNotify_Service, 0) -ACE_FACTORY_DEFINE (TAO_Notify, TAO_CosNotify_Service) +ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_CosNotify_Service) /*********************************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index 0d42cc867eb..680d8d2432f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -13,7 +13,7 @@ #define TAO_Notify_COSNOTIFY_SERVICE_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ class TAO_Notify_EventChannelFactory; * @brief A service object for creating the Notify Service Factory. * */ -class TAO_Notify_Export TAO_CosNotify_Service : public TAO_Notify_Service +class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service { public: /// Constuctor @@ -75,7 +75,7 @@ protected: }; ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service) -ACE_FACTORY_DECLARE (TAO_Notify, TAO_CosNotify_Service) +ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service) ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 71bf67b948f..7f50ca0368e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -192,7 +192,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy CORBA::NO_MEMORY ()); } -ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_Factory) +ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h index f80e6704156..e82cab43b1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h @@ -13,7 +13,7 @@ #define TAO_Notify_DEFAULT_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * @brief Default_Factory interface for creating Notify Objects. * */ -class TAO_Notify_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory +class TAO_Notify_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory { public: /// Constructor @@ -91,7 +91,7 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL); }; -ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_Default_Factory) +ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory) #if defined (__ACE_INLINE__) #include "Default_Factory.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index d3056151c25..af16effffeb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -13,7 +13,7 @@ #define TAO_Notify_ETCL_FILTER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,7 +39,7 @@ * @brief Implementation of CosNotifyFilter::Filter servant. * */ -class TAO_Notify_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase +class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index a1984684d40..4c01423eb95 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -78,4 +78,4 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); } -ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_ETCL_FilterFactory) +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 6a51767c8a5..5c67cbb8f5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_ETCL_FilterFactory +class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : public virtual PortableServer::RefCountServantBase, public virtual POA_CosNotifyFilter::FilterFactory, public virtual TAO_Notify_FilterFactory @@ -86,7 +86,7 @@ protected: #pragma warning(pop) #endif /* _MSC_VER */ -ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_ETCL_FilterFactory) +ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) #if defined (__ACE_INLINE__) #include "ETCL_FilterFactory.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index d931edf6a9a..66a8c40bff3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,7 +39,7 @@ class TAO_Notify_EventType; * @brief Base class abstraction for Events flowing through the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_Event : private ACE_Copy_Disabled +class TAO_Notify_Serv_Export TAO_Notify_Event : private ACE_Copy_Disabled { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index eaac0a7ce8c..e334a2f03e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +42,7 @@ template <class TYPE> class TAO_Notify_Container_T; * @brief Implementation of CosNotifyChannelAdmin::EventChannel * */ -class TAO_Notify_Export TAO_Notify_EventChannel +class TAO_Notify_Serv_Export TAO_Notify_EventChannel : public POA_CosNotifyChannelAdmin::EventChannel, public virtual TAO_Notify_Object { diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 3f5c1745c4f..c93fffd92a2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -41,7 +41,7 @@ template <class TYPE> class TAO_Notify_Container_T; * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory * */ -class TAO_Notify_Export TAO_Notify_EventChannelFactory +class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory : public virtual POA_NotifyExt::EventChannelFactory, public virtual TAO_Notify_Object { diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index c607c4dec95..3fcd875060d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * It is used by the Event Manager as a key to find subscription lists. * */ -class TAO_Notify_Export TAO_Notify_EventType +class TAO_Notify_Serv_Export TAO_Notify_EventType { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index 9d785fb16e6..9f492e605e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -13,7 +13,7 @@ #define TAO_Notify_EVENTTYPESEQ_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ * @brief Allows operations using the CosNotification::EventTypeSeq type. * */ -class TAO_Notify_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType> +class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType> { typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index 317891d5dde..bb9aaa8159d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -47,7 +47,7 @@ typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, * @brief A class that manages the Consumer and Supplier maps. * */ -class TAO_Notify_Export TAO_Notify_Event_Manager +class TAO_Notify_Serv_Export TAO_Notify_Event_Manager { public: /// Constuctor @@ -118,7 +118,7 @@ protected: * @brief Inform ProxyConsumer of updates. * */ -class TAO_Notify_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer> +class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer> { public: TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed); @@ -139,7 +139,7 @@ protected: * @brief Inform ProxySupplier of updates. * */ -class TAO_Notify_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> +class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> { public: TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index 772248e88eb..869803a26b7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 12f22d596db..27567a9c7a2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_EVENT_MAP_T_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h index aabe006a916..d2b7122a09d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h @@ -65,7 +65,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_Notify_Proxy> TAO_Notify_Proxy_Collection; * @brief Factory interface for creating Notify Objects. * */ -class /*TAO_Notify_Export*/ TAO_Notify_Factory : public ACE_Service_Object +class /*TAO_Notify_Serv_Export*/ TAO_Notify_Factory : public ACE_Service_Object { public: /// Create ProxySupplier Collection diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 1ac91e18473..4e40b0b5ac9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -21,7 +21,7 @@ #include "ID_Factory.h" #include "Event.h" -#include "notify_export.h" +#include "notify_serv_export.h" /** * @class TAO_Notify_FilterAdmin @@ -29,7 +29,7 @@ * @brief FilterAdmin interface methods implementation. * */ -class TAO_Notify_Export TAO_Notify_FilterAdmin +class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index d15325cb57f..689aacf4857 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference. * */ -class /*TAO_Notify_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object +class /*TAO_Notify_Serv_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object { public: /// Factory method to create a FilterFactory reference diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index a5123bdbd1b..554a52395a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_FIND_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * */ template <class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> -class TAO_Notify_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE> +class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE> { typedef TAO_Notify_Container_T<TYPE> CONTAINER; typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h index 0a0ba05df0b..f3f6e3127b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief A simple factory for generating ID's for objects created by Notify. * */ -class TAO_Notify_Export TAO_Notify_ID_Factory +class TAO_Notify_Serv_Export TAO_Notify_ID_Factory { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index 545a4d968ba..6134050823d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,7 +34,7 @@ class TAO_Notify_Method_Request; * @brief Base class for Method Requests that do not copy the event. * */ -class TAO_Notify_Export TAO_Notify_Method_Request_No_Copy +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_No_Copy { public: /// Execute the Request @@ -52,7 +52,7 @@ public: * @brief Interface for NS method Requests * */ -class TAO_Notify_Export TAO_Notify_Method_Request : public ACE_Message_Block +class TAO_Notify_Serv_Export TAO_Notify_Method_Request : public ACE_Message_Block { public: enum {PRIORITY_BASE = 32768}; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h index a4150de15f8..156dadf13e9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h @@ -13,7 +13,7 @@ #define TAO_Notify_DISPATCH_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +36,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var , const TAO_Notify_Event_var& , TAO_Notify_ProxySupplier*> TAO_Notify_Method_Request_Dispatch_Base; -class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base , public TAO_Notify_Method_Request { public: @@ -64,7 +64,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event* , const TAO_Notify_Event* , TAO_Notify_ProxySupplier*> TAO_Notify_Method_Request_Dispatch_No_Copy_Base; -class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base , public TAO_Notify_Method_Request_No_Copy { public: @@ -95,7 +95,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var& , const TAO_Notify_Event_var& , TAO_Notify_ProxySupplier*> TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base; -class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base , public TAO_Notify_Method_Request_No_Copy { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h index 9deef7494eb..961db8c576b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 4405bcf25d7..2703fef2955 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_EVENT_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * @brief A method request for storing events. * */ -class TAO_Notify_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index 4668713446d..42bb57b38e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -13,7 +13,7 @@ #define TAO_Notify_LOOKUP_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,7 +38,7 @@ typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier. * */ -class TAO_Notify_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base , public TAO_Notify_Method_Request { public: @@ -65,7 +65,7 @@ typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event* * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier. * */ -class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base , public TAO_Notify_Method_Request_No_Copy { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h index 2b7d34f2044..f9f830b5d3e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_LOOKUP_T_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ * */ template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> -class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h index 3f25e988bdc..2491f9c2862 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ class TAO_Notify_ThreadPool_Task; * @brief Shutdown message for the ThreadPool_Task * */ -class TAO_Notify_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index ed4059e674e..25943a091de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_UPDATES_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +36,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base ,public TAO_Notify_Method_Request { public: @@ -64,7 +64,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base +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_No_Copy { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index 79ae18d313d..bfe4e4de89f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,7 +34,7 @@ namespace CORBA * */ template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> -class TAO_Notify_Export TAO_Notify_Method_Request_Updates_T +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_T { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index d580f0533bb..efc137b0972 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -23,7 +23,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/CosNotifyFilterC.h" -#include "notify_export.h" +#include "notify_serv_export.h" class TAO_Notify_Constraint_Visitor; @@ -32,7 +32,7 @@ class TAO_Notify_Constraint_Visitor; * * @brief "ETCL" Interpreter for the Notify queries. */ -class TAO_Notify_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter +class TAO_Notify_Serv_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index bea7eb79521..431da6aaa51 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -27,13 +27,13 @@ #include "tao/Typecode.h" -#include "notify_export.h" +#include "notify_serv_export.h" class TAO_ETCL_Constraint; class TAO_ETCL_Literal_Constraint; class TAO_Notify_Property_Constraint; -class TAO_Notify_Export TAO_Notify_Constraint_Visitor +class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor : public TAO_ETCL_Constraint_Visitor { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index c178ea925d7..c42ff3682a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -15,7 +15,7 @@ #define NOTIFY_DEFAULT_CO_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ * * Maintained for backward compatibility. */ -class TAO_Notify_Export TAO_Notify_Default_CO_Factory +class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory { public: /// Helper function to register the default factory into the service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index a39f87c19b4..42bbdb9af3c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -14,7 +14,7 @@ #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * * */ -class TAO_Notify_Export TAO_Notify_Default_Collection_Factory +class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index f4372df65a8..7cb29c5264a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -14,7 +14,7 @@ #define NOTIFY_DEFAULT_EMO_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +26,7 @@ * @brief Maintained for backward compatibility. * */ -class TAO_Notify_Export TAO_Notify_Default_EMO_Factory +class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory { public: /// Helper function to register the default factory into the service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index d6d6bfa8583..b80d61f9b53 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -14,7 +14,7 @@ #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ * * @brief Maintained for backward compatibility. */ -class TAO_Notify_Export TAO_Notify_Default_POA_Factory +class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory { public: /// Helper function to register the default factory into the service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index c26c63b15f1..91278b601ca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -26,7 +26,7 @@ * @brief Class maintained for Backward compatibility. * */ -class TAO_Notify_Export TAO_Notify_EventChannelFactory_i +class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory_i { public: /// Create a factory servant and activates it with the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h index f79ffa1a0fe..22eaff5e452 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h @@ -6,7 +6,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -17,7 +17,7 @@ #if defined (TAO_EXPORT_MACRO) # undef TAO_EXPORT_MACRO #endif /* TAO_EXPORT_MACRO */ -#define TAO_EXPORT_MACRO TAO_Notify_Export +#define TAO_EXPORT_MACRO TAO_Notify_Serv_Export namespace TAO_Notify_Extensions { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index f13e1fc8999..cf1f1044fac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,7 +39,7 @@ class TAO_Notify_Timer; * @brief Base Object for RT_Notify's CORBA Objects. * */ -class TAO_Notify_Export TAO_Notify_Object : public TAO_Notify_Refcountable +class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index c5ca6bcd714..831b0dc163d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief POA Abstraction. * */ -class TAO_Notify_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled +class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled { public: /// Default Constructor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 345d8878c1b..deaf6fc66ea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -13,7 +13,7 @@ #define TAO_Notify_PEER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +33,7 @@ class TAO_Notify_Peer; * This object delegates its reference count to its creator proxy object. * */ -class TAO_Notify_Export TAO_Notify_Peer +class TAO_Notify_Serv_Export TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 98bd425dfd3..b81fdae6455 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +35,7 @@ class TAO_Notify_Builder; * @brief Global properties that strategize Notify's run-time behaviour. * */ -class TAO_Notify_Export TAO_Notify_Properties +class TAO_Notify_Serv_Export TAO_Notify_Properties { friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index a9243b79afa..e190ce11d32 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index 4b5a4011f9d..ca241e7bbee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_PropertySeq +class TAO_Notify_Serv_Export TAO_Notify_PropertySeq { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index f2423d6a7a6..a0eeef05462 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ class TAO_Notify_PropertySeq; */ /*******************************************************************************/ -class TAO_Notify_Export TAO_Notify_Property_Boolean +class TAO_Notify_Serv_Export TAO_Notify_Property_Boolean { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 5ad9b2b0654..ff39b43a068 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 6a3bd3f04ad..59a4c347909 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +35,7 @@ class TAO_Notify_Peer; * @brief Base class proxy for all proxys in NS. * */ -class TAO_Notify_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object +class TAO_Notify_Serv_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object { friend class TAO_Notify_Peer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 489d5cbe077..349c9c7b150 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #include "ace/Auto_Ptr.h" @@ -38,7 +38,7 @@ class TAO_Notify_Supplier; * @brief Base class for all types of ProxyConsumer implementations. * */ -class TAO_Notify_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy +class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 051b7cf9af1..6524ce1c0ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * */ template <class SERVANT_TYPE> -class TAO_Notify_Export TAO_Notify_ProxyConsumer_T +class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, public virtual TAO_Notify_ProxyConsumer { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 8b772111525..272c9c3f1ea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -13,7 +13,7 @@ #define TAO_Notify_PROXYSUPPLIER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +33,7 @@ class TAO_Notify_ConsumerAdmin; * @brief Base class for all the ProxySuppliers. * */ -class TAO_Notify_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy +class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy { friend class TAO_Notify_Consumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index 06068e72619..ba545f61ff5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_PROXYSUPPLIER_T_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index 2ff51b1b7ba..7a2726c251c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -125,21 +125,21 @@ public: }; #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_Event_Forwarder::ProxyPushSupplier>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::ProxyPushConsumer>; -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index a4bbde9d275..ba418a24cca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq +class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index efa23ea9ecd..f0b9451f074 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ class TAO_Notify_Timer_Reactor; * @brief A reactive worker task. Simply executes the command in the caller's context. * */ -class TAO_Notify_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 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index 696d491e724..bd8a7d5423c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0. * */ -class TAO_Notify_Export TAO_Notify_Refcountable +class TAO_Notify_Serv_Export TAO_Notify_Refcountable { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index 4c7143bbb11..ac1af0f4323 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 408564117f7..8c0f1949151 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_SEQ_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * */ template <class TYPE> -class TAO_Notify_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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h index e0b582a537b..b49b367c654 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h @@ -28,7 +28,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy +class TAO_Notify_Serv_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 321e2b9878d..b6d77b5d187 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer +class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 923138c2d39..0e34de6a20b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -32,7 +32,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> * * */ -class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier +class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index 297d35f5b80..6cbe894caa3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -38,7 +38,7 @@ class TAO_Notify_Timer; * @brief * */ -class TAO_Notify_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer +class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index b5680908d22..a74f32fe500 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the SequencePushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Serv_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index cd615f00b6e..06881c5b999 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -13,7 +13,7 @@ #define TAO_Notify_SERVICE_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +33,7 @@ * Note that a Service creates only 1 Factory object. * */ -class TAO_Notify_Export TAO_Notify_Service : public ACE_Service_Object +class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object { public: /// Define Service_Object method otherwise SunCC compiler complains. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index 7a7922b960c..d6edc36aa28 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -29,7 +29,7 @@ * */ -class TAO_Notify_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event +class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event { public: /// Constuctor @@ -80,7 +80,7 @@ protected: * @brief StructuredEvent implementation. * */ -class TAO_Notify_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy +class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index d979d1bacf6..4d12ce3a297 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -37,7 +37,7 @@ * @brief CosNotifyChannelAdmin::StructuredProxyPushConsumer implementation. * */ -class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer +class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index 026c155b3e0..b308766a4ce 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -33,7 +33,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Export +template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -44,7 +44,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; * * */ -class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier +class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 98257c8c2bd..1dca5c25440 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -30,7 +30,7 @@ class TAO_Notify_ProxySupplier; * @brief Wrapper for the StructuredPushConsumer that connect to the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer +class TAO_Notify_Serv_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index 8d7cd70a311..f2329db3542 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the StructuredPushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Serv_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 8a377d1a06a..4c8813d5055 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -13,7 +13,7 @@ #define TAO_SUBSCRIPTION_CHANGE_WORKER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ class TAO_Notify_Proxy; * @brief * */ -class TAO_Notify_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy> +class TAO_Notify_Serv_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy> { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 64fea3a6bd4..5a2d12d05f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -13,7 +13,7 @@ #define TAO_Notify_SUPPLIER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Base Wrappers for Suppliers that connect to the EventChannel. * */ -class TAO_Notify_Export TAO_Notify_Supplier : public TAO_Notify_Peer +class TAO_Notify_Serv_Export TAO_Notify_Supplier : public TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index 0b58745597c..bb1233eeae0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin * */ -class TAO_Notify_Export TAO_Notify_SupplierAdmin +class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin : public virtual POA_NotifyExt::SupplierAdmin, public virtual TAO_Notify_Admin { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h index d34b04ec8f3..609f419193a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h @@ -13,7 +13,7 @@ #define TAO_Notify_SUPPLIER_MAP_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index 11572744df0..c2f41442f98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +36,7 @@ class TAO_Notify_Timer_Queue; * @brief Implements a Thread Pool Worker Task. * */ -class TAO_Notify_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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index bee6d611f8a..502bc9724ec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -13,7 +13,7 @@ #define TAO_Notify_TIMER_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ class ACE_Event_Handler; * @brief Interface for scheduling timers. * */ -class TAO_Notify_Export TAO_Notify_Timer : public TAO_Notify_Refcountable +class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable { public: /// Destructor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index d080e94ea38..17410fdfd4a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -13,7 +13,7 @@ #define TAO_Notify_TIMER_QUEUE_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief ACE_Timer_Queue based timer. * */ -class TAO_Notify_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer +class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h index 01fa5803054..0ec20ac850e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h @@ -13,7 +13,7 @@ #define TAO_Notify_TIMER_REACTOR_H #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ class ACE_Reactor; * @brief Reactor::instance based timer. The timers are dispatched by the main thread. * */ -class TAO_Notify_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer +class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index bd6722bc464..394e3651059 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ class TAO_Notify_Buffering_Strategy; * the <shutdown> method should be called to release memory. * */ -class TAO_Notify_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable +class TAO_Notify_Serv_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h new file mode 100644 index 00000000000..ec47ee40ada --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_NOTIFY_SERV_EXPORT_H +#define TAO_NOTIFY_SERV_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_NOTIFY_SERV_HAS_DLL) +# define TAO_NOTIFY_SERV_HAS_DLL 0 +# endif /* ! TAO_NOTIFY_SERV_HAS_DLL */ +#else +# if !defined (TAO_NOTIFY_SERV_HAS_DLL) +# define TAO_NOTIFY_SERV_HAS_DLL 1 +# endif /* ! TAO_NOTIFY_SERV_HAS_DLL */ +#endif + +#if defined (TAO_NOTIFY_SERV_HAS_DLL) && (TAO_NOTIFY_SERV_HAS_DLL == 1) +# if defined (TAO_NOTIFY_SERV_BUILD_DLL) +# define TAO_Notify_Serv_Export ACE_Proper_Export_Flag +# define TAO_NOTIFY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_NOTIFY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_NOTIFY_SERV_BUILD_DLL */ +# define TAO_Notify_Serv_Export ACE_Proper_Import_Flag +# define TAO_NOTIFY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_NOTIFY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_NOTIFY_SERV_BUILD_DLL */ +#else /* TAO_NOTIFY_SERV_HAS_DLL == 1 */ +# define TAO_Notify_Serv_Export +# define TAO_NOTIFY_SERV_SINGLETON_DECLARATION(T) +# define TAO_NOTIFY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_NOTIFY_SERV_HAS_DLL == 1 */ + +#endif /* TAO_NOTIFY_SERV_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 71cb7398e55..b3e7e3ec208 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -41,7 +41,7 @@ class TAO_Constraint_Validator; * EvaluationVisitor, which will evaluate the tree and decide * whether the offer meets the constraints. */ -class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter +class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interpreter { public: // = Initialization and termination methods. @@ -88,7 +88,7 @@ public: * the offers, it will extract the offers in order using the * remove_offer method. */ -class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter +class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interpreter { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 6cfea41fac4..dbc51ad0294 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -19,7 +19,7 @@ #include "tao/Basic_Types.h" -#include "orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_serv_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -54,7 +54,7 @@ namespace CORBA * subclass dispatches the method on an TAO_Constraint_Visitor * correlating to its type. */ -class TAO_Trading_Export TAO_Constraint +class TAO_Trading_Serv_Export TAO_Constraint { public: @@ -76,7 +76,7 @@ public: * * @brief A node that represents an operation with no operands. */ -class TAO_Trading_Export TAO_Noop_Constraint : public TAO_Constraint +class TAO_Trading_Serv_Export TAO_Noop_Constraint : public TAO_Constraint { public: @@ -99,7 +99,7 @@ private: * @brief TAO_Binary_Constraint represents an operation with left * and right operands. */ -class TAO_Trading_Export TAO_Binary_Constraint : public TAO_Constraint +class TAO_Trading_Serv_Export TAO_Binary_Constraint : public TAO_Constraint { public: @@ -158,7 +158,7 @@ private: * @brief TAO_Unary_Constraint represents an operation with only * one operand. */ -class TAO_Trading_Export TAO_Unary_Constraint : public TAO_Constraint +class TAO_Trading_Serv_Export TAO_Unary_Constraint : public TAO_Constraint { public: @@ -192,7 +192,7 @@ private: * @brief TAO_Property_Constraint represents a property whose * value is determined by the offer being evaluated. */ -class TAO_Trading_Export TAO_Property_Constraint : public TAO_Constraint +class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint { public: @@ -223,7 +223,7 @@ private: * @brief TAO_Literal_Constraint represents a literal occuring in * the constraint expression tree. */ -class TAO_Trading_Export TAO_Literal_Constraint : public TAO_Constraint +class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 0add8a6dc7e..fd204d64153 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/Trader/Interpreter_Utils.h" -#include "orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_serv_export.h" #include "ace/Containers.h" class TAO_DynSequence_i; @@ -45,7 +45,7 @@ class TAO_Noop_Constraint; * method to deal with each possible type of node in an * expression tree; one for each operator in the grammar. */ -class TAO_Trading_Export TAO_Constraint_Visitor +class TAO_Trading_Serv_Export TAO_Constraint_Visitor { public: @@ -107,7 +107,7 @@ public: * at which point we can back out of the traversal and indicate * failure. */ -class TAO_Trading_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor +class TAO_Trading_Serv_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor { public: /// Constructor. @@ -217,7 +217,7 @@ private: * evaluation time errors are a divide by a property whose value * is zero and undefined properties. */ -class TAO_Trading_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor +class TAO_Trading_Serv_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor { public: @@ -306,7 +306,7 @@ public: private: - class TAO_Trading_Export Operand_Queue : + class TAO_Trading_Serv_Export Operand_Queue : public ACE_Unbounded_Queue <TAO_Literal_Constraint> // = TITLE // A queue adapter with methods to setting and getting operands diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index ed3a4589d16..4575bc96e89 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -17,7 +17,7 @@ #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" -#include "orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_serv_export.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -29,7 +29,7 @@ class TAO_Constraint_Validator; * build tree method invokes the yacc parser to parse a constraint * or preference string. */ -class TAO_Trading_Export TAO_Interpreter +class TAO_Trading_Serv_Export TAO_Interpreter { protected: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index ef342703f47..fccf6b4491b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -22,11 +22,11 @@ #include "tao/CORBA_String.h" #include "tao/SystemException.h" -#include "orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_serv_export.h" // = Classes to deal with the ACE_Hash_Map_Manager. -class TAO_Trading_Export TAO_String_Hash_Key : public CORBA::String_var +class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var { // = TITLE // Key for the Hash Table. The EXT_ID of the diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index 88a868e027d..b65b50bb49b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -26,7 +26,7 @@ * @brief This class implements CosTradingRepos::ServiceTypeRepository * IDL interface. */ -class TAO_Trading_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository +class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository { public: /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index bd021fc0d11..1dabb8587b5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -28,7 +28,7 @@ #include "orbsvcs/CosTradingS.h" #include "orbsvcs/CosTradingReposS.h" #include "orbsvcs/CosTradingDynamicS.h" -#include "orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_serv_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -50,7 +50,7 @@ class TAO_Trader_Base; * @brief Uses command line arguments to construct a trader instance with * the correct interface support, locking, and policy settings. */ -class TAO_Trading_Export TAO_Trader_Factory +class TAO_Trading_Serv_Export TAO_Trader_Factory { public: @@ -141,7 +141,7 @@ public: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Export TAO_Support_Attributes_i +class TAO_Trading_Serv_Export TAO_Support_Attributes_i { public: // = Initialization and termination methods. @@ -193,7 +193,7 @@ private: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Export TAO_Link_Attributes_i +class TAO_Trading_Serv_Export TAO_Link_Attributes_i { public: // = Initialization and termination methods. @@ -224,7 +224,7 @@ private: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Export TAO_Import_Attributes_i +class TAO_Trading_Serv_Export TAO_Import_Attributes_i { public: // = Initialization and termination methods. @@ -322,7 +322,7 @@ private: * IDL methods in CosTrading::Trader_Components would need * add a _duplicate call for each get method). */ -class TAO_Trading_Export TAO_Trading_Components_i +class TAO_Trading_Serv_Export TAO_Trading_Components_i { public: @@ -396,7 +396,7 @@ private: * want all these classes to be templatized. TAO_Trader_Base class solves * this problem. */ -class TAO_Trading_Export TAO_Trader_Base : public TAO_Lockable +class TAO_Trading_Serv_Export TAO_Trader_Base : public TAO_Lockable { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index cb27e1c038f..e5740b3dc86 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -19,7 +19,7 @@ #include "Trader_Utils.h" #include "orbsvcs/CosTradingC.h" -class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator +class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { public: /** @@ -38,7 +38,7 @@ class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint }; -class TAO_Trading_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator +class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator { public: /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index bd99c2682d8..d77b3153669 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -39,7 +39,7 @@ * CORBA sequences, but requires that the client know the layout of * properties ahead of time. */ -class TAO_Trading_Export TAO_Property_Evaluator +class TAO_Trading_Serv_Export TAO_Property_Evaluator { public: @@ -123,7 +123,7 @@ private: * names to integer indicies, upon which lookups are guaranteed to * be O(lg n). */ -class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator +class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator { public: @@ -182,7 +182,7 @@ private: * @brief Little helper class that you can extend to have your dynamic * property handler construct CosTradingDynamic::DynamicProp structs. */ -class TAO_Trading_Export TAO_Dynamic_Property +class TAO_Trading_Serv_Export TAO_Dynamic_Property : public virtual POA_CosTradingDynamic::DynamicPropEval, public virtual PortableServer::RefCountServantBase { @@ -496,7 +496,7 @@ private: * interface that helps them build a policy sequence without violating * syntax rules and having to mess with typecodes. */ -class TAO_Trading_Export TAO_Policy_Creator +class TAO_Trading_Serv_Export TAO_Policy_Creator { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 4ccc57f7c0e..140a025fbe7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -486,7 +486,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) return 0; } -ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader) +ACE_FACTORY_DEFINE (TAO_Trading_Serv, TAO_Trading_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index ff59d355062..ce679eada06 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -28,7 +28,7 @@ #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader +class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader { public: @@ -106,6 +106,6 @@ public: }; -ACE_FACTORY_DECLARE (TAO_Trading, TAO_Trading_Loader) +ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader) #endif /* TAO_TRADING_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h new file mode 100644 index 00000000000..187f4ab03cd --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_TRADING_SERV_EXPORT_H +#define TAO_TRADING_SERV_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_TRADING_SERV_HAS_DLL) +# define TAO_TRADING_SERV_HAS_DLL 0 +# endif /* ! TAO_TRADING_SERV_HAS_DLL */ +#else +# if !defined (TAO_TRADING_SERV_HAS_DLL) +# define TAO_TRADING_SERV_HAS_DLL 1 +# endif /* ! TAO_TRADING_SERV_HAS_DLL */ +#endif + +#if defined (TAO_TRADING_SERV_HAS_DLL) && (TAO_TRADING_SERV_HAS_DLL == 1) +# if defined (TAO_TRADING_SERV_BUILD_DLL) +# define TAO_Trading_Serv_Export ACE_Proper_Export_Flag +# define TAO_TRADING_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_TRADING_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_TRADING_SERV_BUILD_DLL */ +# define TAO_Trading_Serv_Export ACE_Proper_Import_Flag +# define TAO_TRADING_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_TRADING_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_TRADING_SERV_BUILD_DLL */ +#else /* TAO_TRADING_SERV_HAS_DLL == 1 */ +# define TAO_Trading_Serv_Export +# define TAO_TRADING_SERV_SINGLETON_DECLARATION(T) +# define TAO_TRADING_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_TRADING_SERV_HAS_DLL == 1 */ + +#endif /* TAO_TRADING_SERV_EXPORT_H */ + +// End of auto generated file. |