ChangeLogTag: Wed Jan 5 14:16:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

19 files changed, 6 insertions, 70 deletions

diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 3fdc0892859..0aaabaaa42e 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -3,10 +3,6 @@
 #include "ECT_Driver.h"
 #include "ace/High_Res_Timer.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ECT_Driver.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(EC_Throughput, ECT_Driver, "$Id$")
 
 ECT_Driver::~ECT_Driver (void)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 89701525acc..4b72bb9906b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -36,8 +36,4 @@ public:
   // suppliers.
 };
 
-#if defined (__ACE_INLINE__)
-#include "ECT_Driver.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
deleted file mode 100644
index c5d7985bfbc..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// $Id$
-//
-
-// ****************************************************************
-
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
index 2837a6fa503..a1ff6f58f3c 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -5,7 +5,7 @@ ACE_BUILDDIR = $(top_builddir)/..
 TAO_ROOT = $(top_srcdir)
 TAO_BUILDDIR = $(top_builddir)
 
-## Makefile.ECT_Consumer.am 
+## Makefile.ECT_Consumer.am
 
 noinst_PROGRAMS = ECT_Consumer
 
@@ -23,8 +23,7 @@ ECT_Consumer_SOURCES = \
   ECT_Driver.cpp \
   ECT_Consumer.h \
   ECT_Consumer_Driver.h \
-  ECT_Driver.h \
-  ECT_Driver.i
+  ECT_Driver.h
 
 ECT_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
@@ -41,7 +40,7 @@ ECT_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.ECT_Supplier.am 
+## Makefile.ECT_Supplier.am
 
 noinst_PROGRAMS += ECT_Supplier
 
@@ -77,7 +76,7 @@ ECT_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.ECT_Throughput.am 
+## Makefile.ECT_Throughput.am
 
 noinst_PROGRAMS += ECT_Throughput
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index d942c85c1af..9441287f68b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,10 +4,6 @@
 
 #include "Consumer_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Consumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$Id$")
 
 template <class Consumer_Traits>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 4804b2ead14..82f23b0af2a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -86,10 +86,6 @@ protected:
       ));
 };
 
-#if defined (__ACE_INLINE__)
-#include "Consumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Consumer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 279291b2db2..c078bdc6c35 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -5,12 +5,8 @@
 
 #include "Peer_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Peer_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, 
-           TAO_Notify_Tests_Peer_T, 
+ACE_RCSID (Notify,
+           TAO_Notify_Tests_Peer_T,
            "$Id$")
 
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 8f1b20fd6c1..1d47655f069 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -109,10 +109,6 @@ protected:
    ACE_TYPENAME Proxy_Traits::ID proxy_id_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Peer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Peer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl b/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index ff8bf789324..3641ca65f32 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,10 +4,6 @@
 
 #include "Supplier_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Supplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$Id$")
 
 template <class Supplier_Traits>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index bc27f0954bb..54d2faba200 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -87,10 +87,6 @@ protected:
       ));
 };
 
-#if defined (__ACE_INLINE__)
-#include "Supplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Supplier_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index 96ecc85ba7f..00d5ddfd698 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Timeout, test_i, "$Id$")
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 78b4c9015fd..00018fa25d8 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -43,8 +43,4 @@ private:
   // The ORB
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_TIMEOUT_TEST_I_H */
diff --git a/TAO/tests/Timeout/test_i.i b/TAO/tests/Timeout/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Timeout/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index e224eb939df..b3e9678fa62 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -4,10 +4,6 @@
 
 #if defined(ACE_HAS_XT)
 
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(FL_Cube, test_i, "$Id$")
 
 Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 1450ca0a48b..9250769c1b8 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -51,10 +51,6 @@ private:
   // Hold the timer object...
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ACE_HAS_XT */
 
 #endif /* SERVER_TEST_I_H */
diff --git a/TAO/tests/Xt_Stopwatch/test_i.i b/TAO/tests/Xt_Stopwatch/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Xt_Stopwatch/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$