ChangeLogTag: Wed Jan 5 13:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 2 insertions, 32 deletions

diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 4eb9702ac8c..57fafb8e2ab 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -831,8 +831,6 @@ nobase_include_HEADERS += \
   WStringSeqC.inl \
   Wait_Strategy.inl \
   WrongTransactionC.inl \
-  default_client.i \
-  default_server.i \
   operation_details.i \
   params.i \
   qt_resource.i \
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index ef6ab5c28fb..c70262d05df 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -15,14 +15,9 @@
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            default_client,
            "$Id$")
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 6dd566dd682..613eabecd0b 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -31,7 +31,7 @@
  * options so that everything operates as if there were no
  * dynamically-linkable strategies.
  */
-class TAO_Export TAO_Default_Client_Strategy_Factory 
+class TAO_Export TAO_Default_Client_Strategy_Factory
   : public TAO_Client_Strategy_Factory
 {
 public:
@@ -111,10 +111,6 @@ private:
   Lock_Type muxed_strategy_lock_type_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
 
diff --git a/TAO/tao/default_client.i b/TAO/tao/default_client.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_client.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 42e52eb00c4..9e3da844ee4 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -1,21 +1,14 @@
 // $Id$
 
 #include "tao/default_server.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            default_server,
            "$Id$")
 
-
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND | THR_DETACHED),
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 1f4d488cb9d..776a8114e37 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -31,7 +31,7 @@
  * This design gives substantial freedom for experimentation.
  *
  */
-class TAO_Export TAO_Default_Server_Strategy_Factory 
+class TAO_Export TAO_Default_Server_Strategy_Factory
   : public TAO_Server_Strategy_Factory
 {
 public:
@@ -82,10 +82,6 @@ protected:
   ACE_Time_Value thread_per_connection_timeout_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/default_server.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
 
diff --git a/TAO/tao/default_server.i b/TAO/tao/default_server.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_server.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.