ChangeLogTag:Mon Oct 3 13:30:58 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

10 files changed, 35 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8acc057f8fa..390fca0cdcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Mon Oct  3 13:30:58 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* examples/APG/Containers/Hash_Map.cpp:
+	* examples/APG/Shared_Memory/Malloc.cpp:
+	* examples/APG/Shared_Memory/PI_Malloc.cpp:
+	* examples/APG/Shared_Memory/Pool_Growth.cpp:
+	* examples/Shared_Malloc/Malloc.cpp:
+	* examples/Shared_Malloc/Malloc.h:
+	* examples/Shared_Malloc/test_malloc.cpp:
+	* examples/Shared_Malloc/test_multiple_mallocs.cpp:
+	* examples/Shared_Malloc/test_persistence.cpp:
+	* examples/Shared_Malloc/test_position_independent_malloc.cpp :
+
+          Include appropriate headers to address incomplete type
+	  definition related compile-time errors.  Necessitated by header
+	  dependency reductions in ACE.
+
 Mon Oct  3 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/SSL/SSL_Context.cpp:
diff --git a/examples/APG/Shared_Memory/Malloc.cpp b/examples/APG/Shared_Memory/Malloc.cpp
index 1a15ec74763..0eb7a79780c 100644
--- a/examples/APG/Shared_Memory/Malloc.cpp
+++ b/examples/APG/Shared_Memory/Malloc.cpp
@@ -4,6 +4,7 @@
 #include "ace/OS_NS_string.h"
 
 // Listing 1 code/ch17
+#include "ace/MMAP_Memory_Pool.h"
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
 
diff --git a/examples/APG/Shared_Memory/PI_Malloc.cpp b/examples/APG/Shared_Memory/PI_Malloc.cpp
index 60b4677482c..42673c72b63 100644
--- a/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -4,6 +4,7 @@
 #include "ace/OS_NS_string.h"
 
 // Listing 1 code/ch17
+#include "ace/MMAP_Memory_Pool.h"
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
 #include "ace/PI_Malloc.h"
diff --git a/examples/APG/Shared_Memory/Pool_Growth.cpp b/examples/APG/Shared_Memory/Pool_Growth.cpp
index 7f5ffa7491b..836058ad641 100644
--- a/examples/APG/Shared_Memory/Pool_Growth.cpp
+++ b/examples/APG/Shared_Memory/Pool_Growth.cpp
@@ -2,11 +2,12 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_T.h"
 #include "ace/PI_Malloc.h"
 #include "ace/Process_Mutex.h"
 #include "ace/Process.h"
 #include "ace/Unbounded_Queue.h"
+#include "ace/MMAP_Memory_Pool.h"
 
 #define BACKING_STORE "queue.dat"
 #define QUEUE_NAME "queue.db"
diff --git a/examples/Shared_Malloc/Malloc.cpp b/examples/Shared_Malloc/Malloc.cpp
index 7c88085c5a1..f33367df4b3 100644
--- a/examples/Shared_Malloc/Malloc.cpp
+++ b/examples/Shared_Malloc/Malloc.cpp
@@ -2,7 +2,10 @@
 
 #include "Options.h"
 #include "Malloc.h"
+#include "ace/MMAP_Memory_Pool.h"
+#include "ace/Local_Memory_Pool.h"
 #include "ace/Process_Mutex.h"
+#include "ace/Malloc_T.h"
 
 ACE_RCSID(Shared_Malloc, Malloc, "$Id$")
 
diff --git a/examples/Shared_Malloc/Malloc.h b/examples/Shared_Malloc/Malloc.h
index 6d4cb6bfc12..6b315cd3797 100644
--- a/examples/Shared_Malloc/Malloc.h
+++ b/examples/Shared_Malloc/Malloc.h
@@ -4,12 +4,14 @@
 #ifndef MY_MALLOC_H
 #define MY_MALLOC_H
 
-#include "ace/Malloc.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+class ACE_Allocator;
+
 class Malloc
   // = TITLE
   //      Allocator Singleton.
diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp
index c0531029b95..b6143aa989c 100644
--- a/examples/Shared_Malloc/test_malloc.cpp
+++ b/examples/Shared_Malloc/test_malloc.cpp
@@ -5,6 +5,8 @@
 
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Malloc.h"
+#include "ace/Signal.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_wait.h"
diff --git a/examples/Shared_Malloc/test_multiple_mallocs.cpp b/examples/Shared_Malloc/test_multiple_mallocs.cpp
index 549b83a6044..3f35daa9d26 100644
--- a/examples/Shared_Malloc/test_multiple_mallocs.cpp
+++ b/examples/Shared_Malloc/test_multiple_mallocs.cpp
@@ -4,7 +4,8 @@
 // rooted at different base addresses.
 
 #include "ace/OS_NS_string.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_T.h"
+#include "ace/MMAP_Memory_Pool.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Process_Mutex.h"
 
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 9177d22745d..682ed8a5943 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -7,7 +7,8 @@
 // sized buffers.  This may cause buffers to overrun.
 
 #include "ace/OS_NS_string.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_T.h"
+#include "ace/MMAP_Memory_Pool.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index 9d9dc308a08..cb5c0acd4c8 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -11,6 +11,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Process_Mutex.h"
+#include "ace/Malloc_T.h"
+#include "ace/MMAP_Memory_Pool.h"
 
 ACE_RCSID(Shared_Malloc, test_multiple_mallocs, "$Id$")