ChangeLogTag:Thu Aug 7 00:12:50 UTC 2003 Don Hinton <dhinton@dresystems.com>

7 files changed, 47 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d5530538c7d..22890707962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Thu Aug  7 00:12:50 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/Handle_Set.i:
+          Added several #includes required by the FD_ZERO macro on various
+          platforms, including os_string.h, os_strings.h, and bstring.h,
+          reqired by recent subsetting.
+
+        * ace/Process_Mutex.cpp:
+          Removed explicite template instantiation of
+          ACE_GUARD<ACE_Process_Mutex> that doesn't appear to be needed
+          within ACE and highlighted by recent subsetting.
+
+        * ace/TSS_T.cpp:
+          Added conditional #include TSS_Adapter.h when ACE_HAS_THR_C_DEST
+          defined and required by recent subsetting.
+
+        * ace/Timer_Queue_T.cpp:
+          Added #include Null_Mutex.h required by recent subsetting.
+
 Wed Aug  6 14:50:00 UTC 2003  Gautam Thaker  <gthaker@atl.lmco.com>
 
         Please send all comments/questions about this commit to
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index db6d2e605ee..918ee089e14 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  7 00:12:50 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * orbsvcs/LoadBalancer/Signal_Handler.cpp:
+          Added #include Reactor.h required by recent subsetting.
+
 Wed Aug  6 20:44:51 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * examples/Event_Comm/Event_Comm_i.h:
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index 6e00753699c..e6c646c9833 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -1,7 +1,7 @@
 #include "Signal_Handler.h"
 
 #include "tao/ORB_Core.h"
-
+#include "ace/Reactor.h"
 
 ACE_RCSID (LoadBalancer,
            Signal_Handler,
diff --git a/ace/Handle_Set.i b/ace/Handle_Set.i
index bb9bffe23db..d00fb384863 100644
--- a/ace/Handle_Set.i
+++ b/ace/Handle_Set.i
@@ -4,6 +4,23 @@
 // Handle_Set.i
 #include "ace/Log_Msg.h"
 
+// todo: This should be cleaned up a bit.
+// memset for FD_ZERO on OpenBSD and Solaris w/ gcc 2.95.3
+#include "ace/os_include/os_string.h"
+
+// FreeBSD 4.8-RC? for bzero() used by FD_ZERO
+#include "ace/os_include/os_strings.h"
+
+// IRIX5 defines bzero() in this odd file... used by FD_ZERO
+#if defined (ACE_HAS_BSTRING)
+#  include /**/ <bstring.h>
+#endif /* ACE_HAS_BSTRING */
+
+// AIX defines bzero() in this odd file... used by FD_ZERO
+#if defined (ACE_HAS_STRINGS)
+#  include "ace/os_include/os_strings.h"
+#endif /* ACE_HAS_STRINGS */
+
 // Initialize the bitmask to all 0s and reset the associated fields.
 
 ACE_INLINE void
diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp
index 211f91f183a..b2686fc45ee 100644
--- a/ace/Process_Mutex.cpp
+++ b/ace/Process_Mutex.cpp
@@ -87,10 +87,6 @@ ACE_Process_Mutex::~ACE_Process_Mutex (void)
 //
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Guard<ACE_Process_Mutex>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Guard<ACE_Process_Mutex>
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp
index f074de45b33..08cae3e52e0 100644
--- a/ace/TSS_T.cpp
+++ b/ace/TSS_T.cpp
@@ -19,6 +19,10 @@ ACE_RCSID(ace, TSS_T, "$Id$")
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
 
+#if defined (ACE_HAS_THR_C_DEST)
+#  include "ace/TSS_Adapter.h"
+#endif /* ACE_HAS_THR_C_DEST */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TSS)
 
 template <class TYPE>
diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp
index 6080fbd1827..6909c2ce9f2 100644
--- a/ace/Timer_Queue_T.cpp
+++ b/ace/Timer_Queue_T.cpp
@@ -13,6 +13,7 @@
 #include "ace/Timer_Queue_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Reactor_Timer_Interface.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Timer_Queue_T.i"