From 081b4a9f5ea55b1bb8fb7a7f48632e3cf2a9f5cb Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 5 Jan 2005 19:20:56 +0000
Subject: ChangeLogTag: Wed Jan  5 19:17:12 UTC 2005  Johnny Willemsen 
 <jwillemsen@remedy.nl>

---
 TAO/ChangeLog                             | 6 ++++++
 TAO/orbsvcs/orbsvcs/Makefile.am           | 2 --
 TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp | 4 ----
 TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h   | 4 ----
 TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i   | 5 -----
 5 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2c8d1ea48a8..891f5b0b6d4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan  5 19:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+          Removed include of EC_ConsumerAdmin.i, this file is zapped and
+          it was completely wrong to include that file here.
+
 Wed Jan  5 09:33:54 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/extra_core.mpb:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index a888a4efd9c..ffda87230c7 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -2121,7 +2121,6 @@ noinst_HEADERS += \
   Notify/XML_Topology_Factory.h \
   Channel_Clients_T.i \
   Event_Utilities.i \
-  Runtime_Scheduler.i \
   Scheduler_Factory.i \
   Scheduler_Utilities.i \
   Time_Utilities.i
@@ -4486,7 +4485,6 @@ nobase_include_HEADERS += \
   RtecSchedulerC.inl \
   RtecSchedulerS.inl \
   RtecSchedulerS_T.inl \
-  Runtime_Scheduler.i \
   Sched/DynSched.i \
   Sched/SchedEntry.i \
   Scheduler_Factory.i \
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 1d8f66b8315..30be4e2a8a5 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/Runtime_Scheduler.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (orbsvcs,
            Runtime_Scheduler,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 18243c7d367..caf18c8b441 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -279,9 +279,5 @@ private:
   // The array of precomputed RT_Info structures.
 };
 
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RUNTIME_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-- 
cgit v1.2.1