summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-01 06:49:27 +0000
committerpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-01 06:49:27 +0000
commit3c72c1c3dc50a3ab31158ceb3de0c2884256e006 (patch)
tree49be814c0ecbd5b0a9e0d9118efefe2959f88ed4
parent2916ec0e89cb7c7b66491e967dfbb66ae34f550d (diff)
downloadATCD-3c72c1c3dc50a3ab31158ceb3de0c2884256e006.tar.gz
Tue Aug 1 01:48:52 2000 Pradeep Gore <pradeep@cs.wustl.edu>
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h7
4 files changed, 12 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index d0edf64051a..654d06e6f63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -1,10 +1,8 @@
// $Id$
-#include "ace/Synch_T.h"
-#include "Notify_Default_Collection_Factory.h"
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "Notify_Event.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "Notify_Default_Collection_Factory.h"
#include "Notify_Factory.h"
ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index fb11e21ed11..00f52368bba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -19,9 +19,10 @@
#ifndef NOTIFY_DEFAULT_COLLECTION_FACTORY_H
#define NOTIFY_DEFAULT_COLLECTION_FACTORY_H
+
#include "ace/pre.h"
-#include "Notify_Collection_Factory.h"
#include "notify_export.h"
+#include "Notify_Collection_Factory.h"
#include "Notify_Listeners.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
index 5e47be552f2..b7217bd560a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
@@ -1,15 +1,11 @@
// $Id$
-#include "orbsvcs/ESF/ESF_Worker.h"
+
#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
#include "Notify_Event_Manager.h"
-#include "Notify_EventChannel_i.h"
-#include "Notify_Event_Map.h"
-#include "Notify_Event_Processor.h"
-#include "Notify_Worker_Task.h"
-#include "Notify_Update_Dispatch_Command.h"
#include "Notify_Factory.h"
+#include "Notify_Worker_Task.h"
#include "Notify_Event_Manager_Objects_Factory.h"
-#include "Notify_Event.h"
+#include "Notify_Update_Dispatch_Command.h"
#if ! defined (__ACE_INLINE__)
#include "Notify_Event_Manager.i"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
index 4ec0f39269e..4d06aaea1bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
@@ -25,10 +25,13 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
-#include "Notify_Collection.h"
#include "notify_export.h"
#include "Notify_Listeners.h"
+#include "Notify_Collection.h"
+
+//#include "Notify_Listeners.h"
+//#include "orbsvcs/ESF/ESF_Worker.h"
+//
class TAO_Notify_EventChannel_i;
class TAO_Notify_Event;