Wed Jul 20 11:16:07 2005 Justin Michel <michel_j@ociweb.com>

25 files changed, 59 insertions, 137 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 7bd0bf9c0df..60fa49d1ee2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -6,8 +6,6 @@ ACE_RCSID (RT_Notify,
            TAO_Notify_ConsumerAdmin,
            "$Id$")
 
-#include "ace/Auto_Ptr.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Subscription_Change_Worker.h"
 #include "Proxy.h"
 #include "EventChannel.h"
@@ -19,6 +17,11 @@ ACE_RCSID (RT_Notify,
 #include "ProxySupplier.h"
 
 #include "tao/debug.h"
+
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+
+#include "ace/Auto_Ptr.h"
+
 //#define DEBUG_LEVEL 9
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 07c1acffaa7..a027e130433 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -6,9 +6,6 @@ ACE_RCSID (Notify,
            TAO_Notify_Default_Factory,
            "$Id$")
 
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
-
 #include "EventChannelFactory.h"
 #include "EventChannel.h"
 #include "Admin.h"
@@ -25,6 +22,9 @@ ACE_RCSID (Notify,
 #include "Sequence/SequenceProxyPushSupplier.h"
 #include "Supplier.h"
 
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
+
 template <class PROXY>
 class COW_Collection_Default_Factory
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index eea44db6c58..faefec85e66 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -2,10 +2,6 @@
 
 #include "Event_Manager.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Event_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
 
 #include "ProxyConsumer.h"
@@ -14,8 +10,54 @@ ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
 #include "Supplier_Map.h"
 #include "Event_Map_T.h"
 
+#include "orbsvcs/ESF/ESF_Worker.h"
+
 #include "tao/debug.h"
 
+/********************************************************************************/
+
+/**
+ * @class TAO_Notify_ProxyConsumer_Update_Worker
+ *
+ * @brief Inform ProxyConsumer of updates.
+ *
+ */
+class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
+{
+public:
+  TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
+
+protected:
+  ///= TAO_ESF_Worker method
+  void work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
+
+  const TAO_Notify_EventTypeSeq& added_;
+  const TAO_Notify_EventTypeSeq& removed_;
+};
+
+/********************************************************************************/
+
+/**
+ * @class TAO_Notify_ProxySupplier_Update_Worker
+ *
+ * @brief Inform ProxySupplier of updates.
+ *
+ */
+class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
+{
+public:
+  TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
+
+protected:
+  ///= TAO_ESF_Worker method
+  void work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL);
+
+  const TAO_Notify_EventTypeSeq& added_;
+  const TAO_Notify_EventTypeSeq& removed_;
+};
+
+/********************************************************************************/
+
 TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (void)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index c43d82dffa8..6be3ad683f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
-
 #include "tao/orbconf.h"
 
 #include "ace/CORBA_macros.h"
@@ -116,54 +114,6 @@ private:
   ACE_Auto_Ptr< TAO_Notify_Supplier_Map > supplier_map_;
 };
 
-/********************************************************************************/
-
-/**
- * @class TAO_Notify_ProxyConsumer_Update_Worker
- *
- * @brief Inform ProxyConsumer of updates.
- *
- */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
-{
-public:
-  TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
-
-protected:
-  ///= TAO_ESF_Worker method
-  void work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
-
-  const TAO_Notify_EventTypeSeq& added_;
-  const TAO_Notify_EventTypeSeq& removed_;
-};
-
-/********************************************************************************/
-
-/**
- * @class TAO_Notify_ProxySupplier_Update_Worker
- *
- * @brief Inform ProxySupplier of updates.
- *
- */
-class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
-{
-public:
-  TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
-
-protected:
-  ///= TAO_ESF_Worker method
-  void work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL);
-
-  const TAO_Notify_EventTypeSeq& added_;
-  const TAO_Notify_EventTypeSeq& removed_;
-};
-
-/********************************************************************************/
-
-#if defined (__ACE_INLINE__)
-#include "Event_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_EVENT_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index b1d53e5af32..cf9160bae6a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 1148715ed8e..c47d2ddc2f8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -65,10 +65,6 @@ public:
   void init (const TAO_Notify_Event * event);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 1b58917608d..b88af7fa181 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -19,13 +19,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
 #include "Method_Request_Event.h"
 #include "ProxySupplier.h"
 #include "ProxyConsumer.h"
 #include "Consumer_Map.h"
 #include "Delivery_Request.h"
 
+#include "orbsvcs/ESF/ESF_Worker.h"
+
 class TAO_Notify_Method_Request_Lookup_Queueable;
 class TAO_Notify_Event;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 4c2ea6949d9..50659fef095 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -2,10 +2,6 @@
 
 #include "Peer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Peer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$")
 
 #include "Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 7b9977c77f2..3753ec2e596 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -78,9 +78,5 @@ private:
   virtual void release (void) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Peer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PEER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.inl b/TAO/orbsvcs/orbsvcs/Notify/Peer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 1816c5f7ba3..c0971feeb41 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -2,10 +2,6 @@
 
 #include "Routing_Slip.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Routing_Slip.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Delivery_Request.h"
 #include "Worker_Task.h"
 #include "ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index eb9855cd922..5b77343bec8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -235,9 +235,5 @@ private:
 
 } // namespace
 
-#if defined (__ACE_INLINE__)
-#include "Routing_Slip.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_NOTIFY_ROUTING_SLIP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.inl b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.inl
deleted file mode 100644
index 191a12b479b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-namespace TAO_Notify
-{
-  // this is a placeholder for code that will be moved here RSN.
-
-} // namespace TAO_Notify
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
index 10f316f4e7c..6846edfdf34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
@@ -2,10 +2,6 @@
 
 #include "Routing_Slip_Queue.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Routing_Slip_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index e0e96cc8c50..2a6a8dc3bb5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -84,9 +84,5 @@ namespace TAO_Notify
   };
 } // namespace
 
-#if defined (__ACE_INLINE__)
-#include "Routing_Slip_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_NOTIFY_ROUTING_SLIP_QUEUE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.inl b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.inl
deleted file mode 100644
index f500b5e35e4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-namespace TAO_Notify
-{
-  // code will go here soon
-
-} // namespace TAO_Notify
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 7a372f03abc..4856d2a62b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -2,10 +2,6 @@
 
 #include "Subscription_Change_Worker.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Subscription_Change_Worker.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Proxy.h"
 
 ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index e80974cf60e..873ad8cd3eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -47,9 +47,5 @@ protected:
   const CosNotification::EventTypeSeq & removed_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Subscription_Change_Worker.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_SUBSCRIPTION_CHANGE_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl
deleted file mode 100644
index d4a6e583872..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index cc661b4b2a2..f14d55f1129 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -6,7 +6,6 @@ ACE_RCSID (RT_Notify,
            TAO_Notify_SupplierAdmin,
            "$Id$")
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Builder.h"
 #include "ProxyConsumer.h"
 #include "EventChannel.h"
@@ -16,6 +15,9 @@ ACE_RCSID (RT_Notify,
 #include "Properties.h"
 
 #include "tao/debug.h"
+
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+
 //#define DEBUG_LEVEL 9
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index e7606b37585..a8299c2ecfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -2,10 +2,6 @@
 
 #include "ThreadPool_Task.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ThreadPool_Task.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$")
 
 #include "Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index db2c3e7fab5..7c6ad778e5d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -113,10 +113,6 @@ private:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "ThreadPool_Task.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_THREADPOOL_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl
deleted file mode 100644
index dcf081eb923..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-
-