diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Any')
8 files changed, 19 insertions, 19 deletions
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 |