ChangeLogTag:Tue Aug 5 17:25:35 UTC 2003 Don Hinton <dhinton@dresystems.com>

13 files changed, 57 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index da6c437c3bb..c53b06d6544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+Tue Aug  5 17:25:35 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/Dev_Poll_Reactor.{cpp,h}:
+          Added #includes of Reverse_Lock_T.h, Recursive_Thread_Mutex.h,
+          NUll_Mutex.h, and Lock_Adapter_T.h needed due to recent subsetting.
+
+        * ace/Dump_T.cpp:
+          Added #include of Global_Macros.h.
+
+        * ace/Global_Macros.h:
+          Added #include of the appropriate new header to get the
+          definition of placement new().  Thanks to Olli Savia
+          <ops@iki.fi> for this suggestion.
+
+        * ace/Log_Msg.cpp:
+          Removed the explicite template instantiation of ACE_Reverse_Lock
+          that wasn't used and appeared to be dead code.  Thanks to Olli
+          Savia <ops@iki.fi> for pointing out the problem.
+
+        * ace/Timer_Queue_Adapters.{h,cpp}:
+          Moved #include of Condition_Recursive_Thread_Mutex.h from the
+          cpp to the header since it's used as a member variable.
+
+        * examples/Reactor/WFMO_Reactor/APC.cpp:
+        * examples/Reactor/WFMO_Reactor/Abandoned.cpp:
+        * examples/Reactor/WFMO_Reactor/Registration.cpp:
+        * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp:
+          Added #include of Auto_Event.h needed due to recent subsetting
+          changes.
+
+        * tests/Proactor_Test.cpp:
+          Added #include of Thread_Semaphore needed due to recent
+          subsetting changes.
+        
 Tue Aug  5 15:16:54 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/os_include/os_errno.h:
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index 0af44727309..3a36c0967ab 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -44,6 +44,9 @@ ACE_RCSID (ace,
 #include "ace/Reactor.h"
 #include "ace/Timer_Heap.h"
 #include "ace/ACE.h"
+#include "ace/Reverse_Lock_T.h"
+#include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 
 
 ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify (void)
diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h
index 0f7fb9ae1a0..4509c4fdf82 100644
--- a/ace/Dev_Poll_Reactor.h
+++ b/ace/Dev_Poll_Reactor.h
@@ -34,6 +34,7 @@
 #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
 
 #include "ace/Pipe.h"
+#include "ace/Lock_Adapter_T.h"
 
 // Forward declarations
 class ACE_Sig_Handler;
diff --git a/ace/Dump_T.cpp b/ace/Dump_T.cpp
index d95e43f15f0..f8da5294d4a 100644
--- a/ace/Dump_T.cpp
+++ b/ace/Dump_T.cpp
@@ -5,6 +5,7 @@
 #define ACE_DUMP_T_C
 
 #include "ace/Dump_T.h"
+#include "Global_Macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index e4e184ee093..c57345a7a3c 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -728,6 +728,18 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
      else { new (POINTER) CONSTRUCTOR; } \
    } while (0)
 
+// This is being placed here temporarily to help stablelize the builds, but will
+// be moved out along with the above macros as part of the subsetting.  dhinton
+# if !defined (ACE_HAS_WINCE)
+#   if !defined (ACE_LACKS_NEW_H)
+#     if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+#       include /**/ <new>
+#     else
+#       include /**/ <new.h>
+#     endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+#   endif /* ! ACE_LACKS_NEW_H */
+# endif /* !ACE_HAS_WINCE */
+
 # define ACE_NOOP(x)
 
 #include /**/ "ace/post.h"
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index f129aeedecb..345b616e253 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -74,16 +74,10 @@ int ACE_Log_Msg::instance_count_ = 0;
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 # if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0)
     template class ACE_Cleanup_Adapter<ACE_Log_Msg>;
-#else
-template class ACE_Reverse_Lock<ACE_Recursive_Thread_Mutex>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_Recursive_Thread_Mutex> >;
 # endif /* ! ACE_MT_SAFE */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0)
 #   pragma instantiate ACE_Cleanup_Adapter<ACE_Log_Msg>
-#else
-#pragma instantiate ACE_Reverse_Lock<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_Recursive_Thread_Mutex> >
 # endif /* ! ACE_MT_SAFE */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 14113b5844c..00d5723d80a 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -15,8 +15,6 @@ ACE_RCSID(ace, Timer_Queue_Adapters, "$Id$")
 #  include "ace/Timer_Queue_Adapters.i"
 # endif /* __ACE_INLINE__ */
 
-#include "ace/Condition_Recursive_Thread_Mutex.h"
-
 template <class TQ> TQ &
 ACE_Async_Timer_Queue_Adapter<TQ>::timer_queue (void)
 {
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index 7817639d1e7..1caead77c9d 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Signal.h"
+#include "ace/Condition_Recursive_Thread_Mutex.h"
 
 /**
  * @class ACE_Async_Timer_Queue_Adapter
diff --git a/examples/Reactor/WFMO_Reactor/APC.cpp b/examples/Reactor/WFMO_Reactor/APC.cpp
index 1ffb2c34b4b..77233099662 100644
--- a/examples/Reactor/WFMO_Reactor/APC.cpp
+++ b/examples/Reactor/WFMO_Reactor/APC.cpp
@@ -24,6 +24,7 @@
 #if defined (ACE_WIN32)
 
 #include "ace/Reactor.h"
+#include "ace/Auto_Event.h"
 
 ACE_RCSID(WFMO_Reactor, APC, "$Id$")
 
diff --git a/examples/Reactor/WFMO_Reactor/Abandoned.cpp b/examples/Reactor/WFMO_Reactor/Abandoned.cpp
index 1fc2d012856..5feca2edd61 100644
--- a/examples/Reactor/WFMO_Reactor/Abandoned.cpp
+++ b/examples/Reactor/WFMO_Reactor/Abandoned.cpp
@@ -25,6 +25,7 @@
 #include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Process_Mutex.h"
+#include "ace/Auto_Event.h"
 
 ACE_RCSID(WFMO_Reactor, Abandoned, "$Id$")
 
diff --git a/examples/Reactor/WFMO_Reactor/Registration.cpp b/examples/Reactor/WFMO_Reactor/Registration.cpp
index ff96be40db0..1a857350868 100644
--- a/examples/Reactor/WFMO_Reactor/Registration.cpp
+++ b/examples/Reactor/WFMO_Reactor/Registration.cpp
@@ -38,6 +38,7 @@
 #if defined (ACE_WIN32)
 
 #include "ace/Reactor.h"
+#include "ace/Auto_Event.h"
 
 ACE_RCSID(WFMO_Reactor, Registration, "$Id$")
 
diff --git a/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
index 2ce1ae0c4fa..52cb536725a 100644
--- a/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
+++ b/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
@@ -24,6 +24,7 @@
 
 #include "ace/Reactor.h"
 #include "ace/Registry.h"
+#include "ace/Auto_Event.h"
 
 ACE_RCSID(WFMO_Reactor, Registry_Changes, "$Id$")
 
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index df2b9b3005a..bb42a90d68d 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -39,6 +39,7 @@ ACE_RCSID (tests,
 #include "ace/Asynch_Acceptor.h"
 #include "ace/Asynch_Connector.h"
 #include "ace/Task.h"
+#include "ace/Thread_Semaphore.h"
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)