ChangeLogTag:Thu Dec 11 18:25:39 2003 Steve Huston <shuston@riverace.com>

3 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e15674d9f44..c068615f059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Dec 11 18:25:39 2003  Steve Huston  <shuston@riverace.com>
+
+	* ace/Future.cpp: Added #include "ace/Guard_T.h" and
+	  "ace/Recursive_Thread_Mutex.h" if ACE_HAS_THREADS is defined.
+	  There are ACE_Guards that use it and AIX Visual Age C++ needs
+	  to see these headers to work right.
+
+	* ace/Future_Set.h: Added #include "ace/Null_Mutex.h" since this
+	  file references it in an ACE_Hash_Map_Manager declaration. Even if
+	  it may have been available during compile, Visual Age C++ needs to
+	  see the header during link time as well, and it only remembers to
+	  look at headers that were explicitly included.
+
 Thu Dec 11 18:13:29 2003  Steve Huston  <shuston@riverace.com>
 
 	* ace/OS_NS_netdb.inl: Changed use of naked ::memset() calls to
diff --git a/ace/Future.cpp b/ace/Future.cpp
index c968c21485f..546e093971f 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -13,6 +13,9 @@ ACE_RCSID (ace, Future, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
+#  include "ace/Guard_T.h"
+#  include "ace/Recursive_Thread_Mutex.h"
+
 template <class T>
 ACE_Future_Holder<T>::ACE_Future_Holder (void)
 {
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index f46964bea03..fcd17324d46 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -18,6 +18,7 @@
 #include "ace/Message_Queue.h"
 #include "ace/Future.h"
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once