summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Consumer.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 43b591b51e4..5f4e14af383 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -14,7 +14,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -23,14 +23,11 @@
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNotificationC.h"
-#include "orbsvcs/Notify/Peer.h"
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/Timer.h"
+#include "Peer.h"
+#include "Event.h"
+#include "Timer.h"
#include "ace/Event_Handler.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
class TAO_Notify_ProxySupplier;
class TAO_Notify_Proxy;
class TAO_Notify_Method_Request_Event_Queueable;
@@ -175,6 +172,10 @@ protected:
/// Timer Id.
long timer_id_;
+// todo find some way to use this rather than Request_Queue
+// /// The Buffering Strategy
+// TAO_Notify_Batch_Buffering_Strategy* buffering_strategy_;
+//
/// The Timer Manager that we use.
TAO_Notify_Timer::Ptr timer_;
@@ -184,10 +185,8 @@ private:
ACE_Auto_Ptr< Request_Queue > pending_events_;
};
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Consumer.inl"
+#include "Consumer.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"