diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify')
106 files changed, 257 insertions, 257 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index c01902fea7e..92d8788807f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Notify, TAO_Notify_Admin, "$Id$") -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Container_T.h" #include "Proxy.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index c2c384df821..f26fd54b02d 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Admin : public virtual TAO_Notify_Object +class TAO_Notify_Export TAO_Notify_Admin : public virtual TAO_Notify_Object { friend class TAO_Notify_Builder; public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 1d373b8eac8..74b0ec9f268 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Notify, TAO_Notify_AdminProperties, "$Id$") -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index e7f51ebc5a0..dada530013a 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * @brief The AdminProperties per EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_AdminProperties +class TAO_Notify_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 d97e7bc2b7e..69e19fce382 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -23,7 +23,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_Consumer; @@ -33,7 +33,7 @@ class TAO_Notify_Consumer; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event +class TAO_Notify_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_Serv_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy +class TAO_Notify_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 7cb9b02f115..d1bfcce96ae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "../ProxyConsumer_T.h" @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer +class TAO_Notify_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 69acbdcdacc..a03473c6ca1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "../ProxySupplier_T.h" @@ -32,7 +32,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_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_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier +class TAO_Notify_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 6c732c772ad..06267731c7a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" #if defined(_MSC_VER) @@ -36,7 +36,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer +class TAO_Notify_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 c24668ef7e8..4402cb21ad4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" @@ -33,7 +33,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_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_Serv_Export TAO_Notify_ProxyPushSupplier +class TAO_Notify_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.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index d26302a2cee..fd1ee695630 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" #include "../Event.h" TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index f5ca3aa8af9..5186338831e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" /** @@ -28,7 +28,7 @@ * @brief Wrapper for the PushConsumer that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer +class TAO_Notify_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 9f9ab07131e..9beba8f8d00 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -31,7 +31,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the PushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 55acfa6f5dc..01eb6d0b631 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Notify, #include "ace/Message_Queue.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "Method_Request.h" #include "Notify_Extensions.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index fb2bdc4627c..d9159c14863 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "ace/Null_Condition.h" #include "ace/Message_Queue.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Property.h" #include "Property_T.h" @@ -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_Serv_Export TAO_Notify_Buffering_Strategy +class TAO_Notify_Export TAO_Notify_Buffering_Strategy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index bcf5abd6bec..d5c959508d3 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,8 +22,8 @@ #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "AdminProperties.h" @@ -40,7 +40,7 @@ class TAO_Notify_Object; * @brief Helper class to create and activate CORBA objects. * */ -class TAO_Notify_Serv_Export TAO_Notify_Builder +class TAO_Notify_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 bac8a0cbded..f7ff532b790 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -14,14 +14,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "Peer.h" #include "Event.h" @@ -35,7 +35,7 @@ class TAO_Notify_Proxy; * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel * */ -class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer +class TAO_Notify_Export TAO_Notify_Consumer : public TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 5552b0df58b..3f9a5f08608 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -11,7 +11,7 @@ ACE_RCSID (RT_Notify, "$Id$") #include "ace/Auto_Ptr.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Subscription_Change_Worker.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 99964a7cd11..394f43568b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Admin.h" @@ -37,7 +37,7 @@ * @brief Implementation of CosNotifyChannelAdmin::ConsumerAdmin * */ -class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin +class TAO_Notify_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 7a296f0d5b5..ce37ae65180 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index f3dddbcffe4..e469099bfa1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -9,8 +9,8 @@ #include "Factory.h" #include "POA_Helper.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "Container_T.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 6713775b023..59a953d6a46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" /** * @class TAO_Notify_Container_T @@ -30,7 +30,7 @@ * */ template <class TYPE> -class TAO_Notify_Serv_Export TAO_Notify_Container_T +class TAO_Notify_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 5dccf6d8084..323ce71551c 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_CosNotify_Initializer +class TAO_Notify_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 4fcfbe8081e..5e97efabfa8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -8,7 +8,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "tao/debug.h" ACE_RCSID (Notify, @@ -260,7 +260,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CosNotify_Service, 0) -ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_CosNotify_Service) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_CosNotify_Service) /*********************************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index 680d8d2432f..0d42cc867eb 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_serv_export.h" +#include "notify_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_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service +class TAO_Notify_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_Serv, TAO_CosNotify_Service) +ACE_FACTORY_DECLARE (TAO_Notify, 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 7f50ca0368e..4dc6a1be779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -10,8 +10,8 @@ ACE_RCSID (Notify, TAO_Notify_Default_Factory, "$Id$") -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" #include "EventChannelFactory.h" #include "EventChannel.h" @@ -192,7 +192,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy CORBA::NO_MEMORY ()); } -ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory) +ACE_FACTORY_DEFINE (TAO_Notify, 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 e82cab43b1b..f80e6704156 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory +class TAO_Notify_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_Serv, TAO_Notify_Default_Factory) +ACE_FACTORY_DECLARE (TAO_Notify, 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 af16effffeb..8f7f4c667bf 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/Containers_T.h" #include "ace/Hash_Map_Manager.h" #include "ace/Atomic_Op.h" -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "Notify_Constraint_Interpreter.h" #include "ace/Null_Mutex.h" @@ -39,7 +39,7 @@ * @brief Implementation of CosNotifyFilter::Filter servant. * */ -class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase +class TAO_Notify_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 4c01423eb95..a1984684d40 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_Serv, TAO_Notify_ETCL_FilterFactory) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 5c67cbb8f5a..290d305d385 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "FilterFactory.h" @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory +class TAO_Notify_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_Serv, TAO_Notify_ETCL_FilterFactory) +ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_ETCL_FilterFactory) #if defined (__ACE_INLINE__) #include "ETCL_FilterFactory.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index b731ccf5f4d..60fbdcbec72 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "tao/debug.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" TAO_Notify_Event::TAO_Notify_Event (void) :priority_ (CosNotification::Priority, CosNotification::DefaultPriority), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 66a8c40bff3..595e666c059 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +23,9 @@ #include "ace/Copy_Disabled.h" #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/Event_ForwarderS.h" -#include "orbsvcs/CosNotifyFilterC.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "Property.h" #include "Property_T.h" @@ -39,7 +39,7 @@ class TAO_Notify_EventType; * @brief Base class abstraction for Events flowing through the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_Event : private ACE_Copy_Disabled +class TAO_Notify_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 e334a2f03e5..b2fcdf3618c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "Object.h" @@ -42,7 +42,7 @@ template <class TYPE> class TAO_Notify_Container_T; * @brief Implementation of CosNotifyChannelAdmin::EventChannel * */ -class TAO_Notify_Serv_Export TAO_Notify_EventChannel +class TAO_Notify_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 c93fffd92a2..21db8d744e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -14,14 +14,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Object.h" @@ -41,7 +41,7 @@ template <class TYPE> class TAO_Notify_Container_T; * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory * */ -class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory +class TAO_Notify_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 3fcd875060d..c4a43ef34b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_EventType @@ -31,7 +31,7 @@ * It is used by the Event Manager as a key to find subscription lists. * */ -class TAO_Notify_Serv_Export TAO_Notify_EventType +class TAO_Notify_Export TAO_Notify_EventType { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index 9f492e605e7..9d785fb16e6 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType> +class TAO_Notify_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 bb9aaa8159d..05bd7babae0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/orbconf.h" @@ -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_Serv_Export TAO_Notify_Event_Manager +class TAO_Notify_Export TAO_Notify_Event_Manager { public: /// Constuctor @@ -118,7 +118,7 @@ protected: * @brief Inform ProxyConsumer of updates. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer> +class TAO_Notify_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_Serv_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> +class TAO_Notify_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.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 089a32adca0..a9b78c54179 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Notify, TAO_Notify_Event_Map_Entry_T, "$Id$") -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index 869803a26b7..772248e88eb 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 77de698806d..bad6e640cac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -4,7 +4,7 @@ #define TAO_Notify_EVENT_MAP_T_C #include "Event_Map_T.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Event_Map_Entry_T.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 27567a9c7a2..12f22d596db 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_serv_export.h" +#include "notify_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 d2b7122a09d..aabe006a916 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_Serv_Export*/ TAO_Notify_Factory : public ACE_Service_Object +class /*TAO_Notify_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 4e40b0b5ac9..7f7eb146061 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "ace/Hash_Map_Manager.h" #include "ID_Factory.h" #include "Event.h" -#include "notify_serv_export.h" +#include "notify_export.h" /** * @class TAO_Notify_FilterAdmin @@ -29,7 +29,7 @@ * @brief FilterAdmin interface methods implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin +class TAO_Notify_Export TAO_Notify_FilterAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index 689aacf4857..d15325cb57f 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_serv_export.h" +#include "notify_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_Serv_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object +class /*TAO_Notify_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 554a52395a7..9fcf4aa8c7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -13,14 +13,14 @@ #define TAO_Notify_FIND_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" #include "Object.h" @@ -31,7 +31,7 @@ * */ template <class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> -class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE> +class TAO_Notify_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 f3f6e3127b0..0a0ba05df0b 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_ID_Factory +class TAO_Notify_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 6134050823d..545a4d968ba 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Method_Request_No_Copy +class TAO_Notify_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_Serv_Export TAO_Notify_Method_Request : public ACE_Message_Block +class TAO_Notify_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 156dadf13e9..a4150de15f8 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base +class TAO_Notify_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_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public 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 , 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_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public 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 , 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 961db8c576b..9deef7494eb 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_serv_export.h" +#include "notify_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 2703fef2955..4405bcf25d7 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * @brief A method request for storing events. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request +class TAO_Notify_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 42bb57b38e7..e2c29af3b0d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -13,13 +13,13 @@ #define TAO_Notify_LOOKUP_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "Method_Request.h" #include "ProxyConsumer.h" #include "Consumer_Map.h" @@ -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_Serv_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base +class TAO_Notify_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_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base +class TAO_Notify_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 f9f830b5d3e..9f99375103e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -13,13 +13,13 @@ #define TAO_Notify_METHOD_REQUEST_LOOKUP_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "ProxySupplier.h" /** @@ -29,7 +29,7 @@ * */ template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> +class TAO_Notify_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 2491f9c2862..3f25e988bdc 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request +class TAO_Notify_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 25943a091de..ed4059e674e 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base +class TAO_Notify_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_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base +class TAO_Notify_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 bfe4e4de89f..79ae18d313d 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Method_Request_Updates_T +class TAO_Notify_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 efc137b0972..6d38a1e3013 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -15,15 +15,15 @@ #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/CosNotifyFilterC.h" -#include "notify_serv_export.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" +#include "notify_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_Serv_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter +class TAO_Notify_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 55fe28b9c8b..2b47025061a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,8 +1,8 @@ /* $Id$ */ #include "Notify_Constraint_Visitors.h" -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" #include "tao/Any_Unknown_IDL_Type.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 431da6aaa51..c97c326b4ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -22,18 +22,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "tao/Typecode.h" -#include "notify_serv_export.h" +#include "notify_export.h" class TAO_ETCL_Constraint; class TAO_ETCL_Literal_Constraint; class TAO_Notify_Property_Constraint; -class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor +class TAO_Notify_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 c42ff3682a1..c178ea925d7 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ * * Maintained for backward compatibility. */ -class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory +class TAO_Notify_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 42bbdb9af3c..a39f87c19b4 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * * */ -class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory +class TAO_Notify_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 7cb29c5264a..f4372df65a8 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +26,7 @@ * @brief Maintained for backward compatibility. * */ -class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory +class TAO_Notify_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 b80d61f9b53..d6d6bfa8583 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ * * @brief Maintained for backward compatibility. */ -class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory +class TAO_Notify_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 91278b601ca..21fdb8359bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -13,8 +13,8 @@ #define NOTIFY_EVENTCHANNELFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "notify_serv_export.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -26,7 +26,7 @@ * @brief Class maintained for Backward compatibility. * */ -class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory_i +class TAO_Notify_Export TAO_Notify_EventChannelFactory_i { public: /// Create a factory servant and activates it with the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index cf1f1044fac..216dcb9cd8c 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "QoSProperties.h" #include "AdminProperties.h" @@ -39,7 +39,7 @@ class TAO_Notify_Timer; * @brief Base Object for RT_Notify's CORBA Objects. * */ -class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable +class TAO_Notify_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 831b0dc163d..c5ca6bcd714 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief POA Abstraction. * */ -class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled +class TAO_Notify_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 deaf6fc66ea..710dd3e1202 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -13,13 +13,13 @@ #define TAO_Notify_PEER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "EventTypeSeq.h" class TAO_Notify_Proxy; @@ -33,7 +33,7 @@ class TAO_Notify_Peer; * This object delegates its reference count to its creator proxy object. * */ -class TAO_Notify_Serv_Export TAO_Notify_Peer +class TAO_Notify_Export TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index f9f7f9d567f..ecdfac34c9b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Properties.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 4542a14bff6..5d938efd4dc 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_Factory; class TAO_Notify_Builder; @@ -35,7 +35,7 @@ class TAO_Notify_Builder; * @brief Global properties that strategize Notify's run-time behaviour. * */ -class TAO_Notify_Serv_Export TAO_Notify_Properties +class TAO_Notify_Export TAO_Notify_Properties { friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>; @@ -136,7 +136,7 @@ protected: typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES; -TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX) +TAO_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX) #if defined (__ACE_INLINE__) #include "Properties.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index e190ce11d32..f551b53c1a7 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "tao/orbconf.h" #include "tao/TimeBaseC.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" template <class LOCK, class TYPE> class ACE_Atomic_Op; template <class TYPE> class TAO_Notify_Property_T; diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index ca241e7bbee..72554b0170d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" @@ -32,7 +32,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_PropertySeq +class TAO_Notify_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 a0eeef05462..71cf25ad690 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; @@ -32,7 +32,7 @@ class TAO_Notify_PropertySeq; */ /*******************************************************************************/ -class TAO_Notify_Serv_Export TAO_Notify_Property_Boolean +class TAO_Notify_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 ff39b43a068..88362f193b4 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/SString.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 59a4c347909..6a3bd3f04ad 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object +class TAO_Notify_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 349c9c7b150..523c572b0a7 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_serv_export.h" +#include "notify_export.h" #include "ace/Auto_Ptr.h" @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "Refcountable_Guard_T.h" #include "Event.h" @@ -38,7 +38,7 @@ class TAO_Notify_Supplier; * @brief Base class for all types of ProxyConsumer implementations. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy +class TAO_Notify_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 6524ce1c0ab..051b7cf9af1 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * */ template <class SERVANT_TYPE> -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T +class TAO_Notify_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 272c9c3f1ea..641aab7f7b1 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "Event.h" #include "Proxy.h" #include "Refcountable_Guard_T.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" class TAO_Notify_Consumer; class TAO_Notify_ConsumerAdmin; @@ -33,7 +33,7 @@ class TAO_Notify_ConsumerAdmin; * @brief Base class for all the ProxySuppliers. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy +class TAO_Notify_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 ba545f61ff5..06068e72619 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_serv_export.h" +#include "notify_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 7a2726c251c..2ff51b1b7ba 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_serv_export.h" +#include "notify_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_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_Event_Forwarder::ProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::ProxyPushConsumer>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_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 ba418a24cca..a4bbde9d275 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq +class TAO_Notify_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index ecbcb9a205d..3850565c129 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -7,7 +7,7 @@ #include "ETCL_FilterFactory.h" #include "RT_POA_Helper.h" #include "Properties.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Object.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 4a507f456f7..6c049c0713e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -3,7 +3,7 @@ #include "RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "RT_Properties.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index 24b3491f52c..85bcdecd998 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "POA_Helper.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" /** * @class TAO_Notify_RT_POA_Helper diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index f0b9451f074..efa23ea9ecd 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task +class TAO_Notify_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 bd8a7d5423c..696d491e724 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Refcountable +class TAO_Notify_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 ac1af0f4323..4c7143bbb11 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_serv_export.h" +#include "notify_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 8c0f1949151..356bbde952f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -13,14 +13,14 @@ #define TAO_Notify_SEQ_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" /** @@ -30,7 +30,7 @@ * */ template <class TYPE> -class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE> +class TAO_Notify_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 b49b367c654..e0b582a537b 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_Serv_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy +class TAO_Notify_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 b6d77b5d187..21e6c057798 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer +class TAO_Notify_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 0e34de6a20b..640e8a0f1b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxySupplier_T.h" @@ -32,7 +32,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_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_Serv_Export TAO_Notify_SequenceProxyPushSupplier +class TAO_Notify_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 6cbe894caa3..297d35f5b80 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_Serv_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer +class TAO_Notify_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 a74f32fe500..ef22534d68a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the SequencePushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier +class TAO_Notify_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 06881c5b999..06536f80d13 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "tao/PortableServer/PortableServer.h" /** @@ -33,7 +33,7 @@ * Note that a Service creates only 1 Factory object. * */ -class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object +class TAO_Notify_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 d6edc36aa28..c964fdc8937 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -20,7 +20,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_StructuredEvent_No_Copy @@ -29,7 +29,7 @@ * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event +class TAO_Notify_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event { public: /// Constuctor @@ -80,7 +80,7 @@ protected: * @brief StructuredEvent implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy +class TAO_Notify_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 4d12ce3a297..143f1d5bd03 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" @@ -37,7 +37,7 @@ * @brief CosNotifyChannelAdmin::StructuredProxyPushConsumer implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer +class TAO_Notify_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 b308766a4ce..d71db430726 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" @@ -33,7 +33,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_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_Serv_Export TAO_Notify_StructuredProxyPushSupplier +class TAO_Notify_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 1dca5c25440..36f6f7f8096 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" class TAO_Notify_ProxySupplier; @@ -30,7 +30,7 @@ class TAO_Notify_ProxySupplier; * @brief Wrapper for the StructuredPushConsumer that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer +class TAO_Notify_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 f2329db3542..65e95c3d175 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the StructuredPushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier +class TAO_Notify_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 4c8813d5055..5763746a3c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -13,14 +13,14 @@ #define TAO_SUBSCRIPTION_CHANGE_WORKER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" class TAO_Notify_Proxy; @@ -30,7 +30,7 @@ class TAO_Notify_Proxy; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy> +class TAO_Notify_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 5a2d12d05f0..8494f431b98 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,7 +21,7 @@ #include "Peer.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" class TAO_Notify_ProxyConsumer; /** @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Base Wrappers for Suppliers that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_Supplier : public TAO_Notify_Peer +class TAO_Notify_Export TAO_Notify_Supplier : public TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 37823207801..5df0e4487eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -10,7 +10,7 @@ ACE_RCSID (RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Builder.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index bb1233eeae0..c9ae1a3ff5d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Admin.h" @@ -37,7 +37,7 @@ * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin * */ -class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin +class TAO_Notify_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 609f419193a..d34b04ec8f3 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_serv_export.h" +#include "notify_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 c2f41442f98..11572744df0 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH> +class TAO_Notify_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 502bc9724ec..bee6d611f8a 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable +class TAO_Notify_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 17410fdfd4a..d080e94ea38 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_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief ACE_Timer_Queue based timer. * */ -class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer +class TAO_Notify_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 0ec20ac850e..01fa5803054 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer +class TAO_Notify_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 394e3651059..bd6722bc464 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_serv_export.h" +#include "notify_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_Serv_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable +class TAO_Notify_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable { public: /// Constuctor |