ChangeLogTag:Tue May 31 11:49:23 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

15 files changed, 56 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
index fb293833f1d..645ad673a19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Tue May 31 11:49:23 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* ace/Free_List.inl:
+	* ace/Message_Queue_T.inl:
+	* ace/POSIX_CB_Proactor.inl:
+	* ace/SUN_Proactor.inl:
+
+	  Removed these empty inline files.
+
+	* ace/Free_List.cpp:
+	* ace/Free_List.h:
+	* ace/Message_Queue_T.cpp:
+	* ace/Message_Queue_T.h:
+	* ace/POSIX_CB_Proactor.cpp:
+	* ace/POSIX_CB_Proactor.h:
+	* ace/SUN_Proactor.cpp:
+	* ace/SUN_Proactor.h:
+
+	  Removed include directives for removed inline files.
+
+	* ace/Timer_Queue_Adapters.cpp (activate):
+
+	  Moved method definition out of ACE_HAS_DEFERRED_TIMER_COMMANDS
+	  block.  Fixes "unresolved symbol" link-time errors.
+
 Tue May 31 10:39:10 2005  Justin Michel  <michel_j@ociweb.com>
 
         * ace/String_Base.inl:
diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp
index 23d00ebc960..d0d24e2ba05 100644
--- a/ace/Free_List.cpp
+++ b/ace/Free_List.cpp
@@ -10,10 +10,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Free_List.inl"
-#endif /* __ACE_INLINE__ */
-
 
 // Empty constructor
 
diff --git a/ace/Free_List.h b/ace/Free_List.h
index 4f4b3a3366a..b229406c991 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -134,10 +134,6 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Locked_Free_List<T, ACE_LOCK> &))
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/Free_List.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Free_List.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Free_List.inl b/ace/Free_List.inl
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/ace/Free_List.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 7528d8a81d1..8722da6b65c 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -511,7 +511,6 @@ nobase_include_HEADERS = \
   Framework_Component_T.h \
   Free_List.cpp \
   Free_List.h \
-  Free_List.inl \
   Functor.h \
   Functor.inl \
   Functor_String.h \
@@ -648,7 +647,6 @@ nobase_include_HEADERS = \
   Message_Queue.inl \
   Message_Queue_T.cpp \
   Message_Queue_T.h \
-  Message_Queue_T.inl \
   Method_Object.h \
   Method_Request.h \
   Metrics_Cache.h \
@@ -771,7 +769,6 @@ nobase_include_HEADERS = \
   PI_Malloc.inl \
   POSIX_Asynch_IO.h \
   POSIX_CB_Proactor.h \
-  POSIX_CB_Proactor.inl \
   POSIX_Proactor.h \
   POSIX_Proactor.inl \
   Pagefile_Memory_Pool.h \
@@ -870,7 +867,6 @@ nobase_include_HEADERS = \
   SString.inl \
   SStringfwd.h \
   SUN_Proactor.h \
-  SUN_Proactor.inl \
   SV_Message.h \
   SV_Message.inl \
   SV_Message_Queue.h \
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 111808319c2..5c34ed9f251 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -13,10 +13,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Message_Queue_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Notification_Strategy.h"
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue)
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index a8833fec40d..9c4de7256c1 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -1224,10 +1224,6 @@ protected:
   ACE_Message_Queue<ACE_SYNCH_USE> queue_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/Message_Queue_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Message_Queue_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Message_Queue_T.inl b/ace/Message_Queue_T.inl
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/ace/Message_Queue_T.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/ace/POSIX_CB_Proactor.cpp b/ace/POSIX_CB_Proactor.cpp
index 98bfc985f55..0c4df22b45e 100644
--- a/ace/POSIX_CB_Proactor.cpp
+++ b/ace/POSIX_CB_Proactor.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ace/POSIX_CB_Proactor.h"
@@ -9,9 +8,11 @@
 #include "ace/Log_Msg.h"
 #include "ace/Object_Manager.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/POSIX_CB_Proactor.inl"
-#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (ace,
+           POSIX_CB_Proactor,
+           "$Id$")
+
 
 ACE_POSIX_CB_Proactor::ACE_POSIX_CB_Proactor (size_t max_aio_operations)
   : ACE_POSIX_AIOCB_Proactor (max_aio_operations,
diff --git a/ace/POSIX_CB_Proactor.h b/ace/POSIX_CB_Proactor.h
index b6891cb0e0d..6021b32a04f 100644
--- a/ace/POSIX_CB_Proactor.h
+++ b/ace/POSIX_CB_Proactor.h
@@ -92,9 +92,5 @@ protected:
   ACE_SYNCH_SEMAPHORE sema_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/POSIX_CB_Proactor.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__  */
 #endif /* ACE_POSIX_CB_PROACTOR_H*/
diff --git a/ace/POSIX_CB_Proactor.inl b/ace/POSIX_CB_Proactor.inl
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/ace/POSIX_CB_Proactor.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp
index c3928d525cf..2f6e69fcc3d 100644
--- a/ace/SUN_Proactor.cpp
+++ b/ace/SUN_Proactor.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ace/SUN_Proactor.h"
@@ -9,9 +8,11 @@
 #include "ace/Log_Msg.h"
 #include "ace/Object_Manager.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/SUN_Proactor.inl"
-#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (ace,
+           POSIX_CB_Proactor,
+           "$Id$")
+
 
 ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations)
   : ACE_POSIX_AIOCB_Proactor (max_aio_operations,
diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h
index 788af44b46b..fce65b40541 100644
--- a/ace/SUN_Proactor.h
+++ b/ace/SUN_Proactor.h
@@ -118,9 +118,5 @@ protected:
   ACE_SYNCH_CONDITION condition_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/SUN_Proactor.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ACE_HAS_AIO_CALLS && sun */
 #endif /* ACE_SUN_PROACTOR_H*/
diff --git a/ace/SUN_Proactor.inl b/ace/SUN_Proactor.inl
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/ace/SUN_Proactor.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 82f78f80284..13489a858a2 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -275,6 +275,27 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::svc (void)
   return 0;
 }
 
+template<class TQ> int
+ACE_Thread_Timer_Queue_Adapter<TQ>::activate (long flags,
+                                              int ,
+                                              int ,
+                                              long priority,
+                                              int grp_id,
+                                              ACE_Task_Base *task,
+                                              ACE_hthread_t thread_handles[],
+                                              void *stack[],
+                                              size_t stack_size[],
+                                              ACE_thread_t thread_names[])
+{
+  // Macros to avoid "warning: unused parameter" type warning.
+  ACE_UNUSED_ARG (thread_handles);
+
+  // Make sure that we only allow a single thread to be spawned for
+  // our adapter.  Otherwise, too many weird things can happen.
+  return ACE_Task_Base::activate (flags, 1, 0, priority, grp_id, task, 0,
+                                  stack, stack_size, thread_names);
+}
+
 # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
 
 // Enqueues a command object for execution just before waiting on the next
@@ -317,27 +338,6 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::dispatch_commands (void)
   return 0;
 }
 
-template<class TQ> int
-ACE_Thread_Timer_Queue_Adapter<TQ>::activate (long flags,
-                                              int ,
-                                              int ,
-                                              long priority,
-                                              int grp_id,
-                                              ACE_Task_Base *task,
-                                              ACE_hthread_t thread_handles[],
-                                              void *stack[],
-                                              size_t stack_size[],
-                                              ACE_thread_t thread_names[])
-{
-  // Macros to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (thread_handles);
-
-  // Make sure that we only allow a single thread to be spawned for
-  // our adapter.  Otherwise, too many weird things can happen.
-  return ACE_Task_Base::activate (flags, 1, 0, priority, grp_id, task, 0,
-                                  stack, stack_size, thread_names);
-}
-
 # endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */
 
 #endif /* ACE_TIMER_QUEUE_ADAPTERS_CPP */