8 files changed, 8 insertions, 21 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 891f5b0b6d4..bfe8c28f7ba 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan  5 19:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp,i}:
+          Removed i file, update h/cpp
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for change above
+
 Wed Jan  5 19:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 7e360800f17..9b1e3fb78ca 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1069,12 +1069,10 @@ nobase_include_HEADERS += \
   PortableServer/Active_Object_Map.i \
   PortableServer/ImplRepoC.i \
   PortableServer/ImplRepoS.i \
-  PortableServer/Key_Adapters.i \
   PortableServer/Object_Adapter.i \
   PortableServer/POA.i \
   PortableServer/POAManager.i \
   PortableServer/POA_Cached_Policies.i \
-  PortableServer/POA_Policies.i \
   PortableServer/POA_Policy_Set.i \
   PortableServer/PolicyS.inl \
   PortableServer/PolicyS_T.inl \
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index ba8d96e1f34..ccc6fb3b61b 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -5,10 +5,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
 ////////////////////////////////////////////////////////////////////////////////
 
 TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index 6bd1b654074..76aa08c087a 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -116,10 +116,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined (__ACE_INLINE__)
-# include "Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_KEY_ADAPTERS_H */
diff --git a/TAO/tao/PortableServer/Key_Adapters.i b/TAO/tao/PortableServer/Key_Adapters.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/PortableServer/Key_Adapters.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp
index 4c521d2984e..b9517b4d302 100644
--- a/TAO/tao/PortableServer/POA_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Policies.cpp
@@ -4,10 +4,6 @@
 
 #include "tao/ORB_Constants.h"
 
-#if !defined (__ACE_INLINE__)
-# include "POA_Policies.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID(PortableServer, POA_Policies, "$Id$")
 
 
diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h
index 5173642bf78..38d79f8d9bd 100644
--- a/TAO/tao/PortableServer/POA_Policies.h
+++ b/TAO/tao/PortableServer/POA_Policies.h
@@ -284,9 +284,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-# include "POA_Policies.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_POA_POLICIES_H */
diff --git a/TAO/tao/PortableServer/POA_Policies.i b/TAO/tao/PortableServer/POA_Policies.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/PortableServer/POA_Policies.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-