From 47afb9a4886dd3777624ff0bc2790c0c1919007f Mon Sep 17 00:00:00 2001
From: levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Thu, 22 Jul 1999 19:23:48 +0000
Subject: ChangeLogTag: Thu Jul 22 14:22:41 1999  David L. Levine 
 <levine@cs.wustl.edu>

---
 ChangeLog-99b                     |  6 ++++++
 examples/Shared_Malloc/Malloc.cpp | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog-99b b/ChangeLog-99b
index ce7fd4c2d76..dd3b8ea3c87 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,9 @@
+Thu Jul 22 14:22:41 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * examples/Shared_Malloc/Malloc.cpp: fixed explicit
+          template instantiations so that there are no duplications
+          with ACE_LACKS_SBRK and ACE_LACKS_SYSV_SHMEM.
+
 Thu Jul 22 12:17:26 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/config-lynxos.h: removed ACE_LACKS_FORK on PowerPC.
diff --git a/examples/Shared_Malloc/Malloc.cpp b/examples/Shared_Malloc/Malloc.cpp
index 474e4b6d8f3..510fbe729a9 100644
--- a/examples/Shared_Malloc/Malloc.cpp
+++ b/examples/Shared_Malloc/Malloc.cpp
@@ -57,8 +57,13 @@ Malloc::instance (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Allocator_Adapter<L_ALLOCATOR>;
 template class ACE_Allocator_Adapter<M_ALLOCATOR>;
+#if !defined (ACE_LACKS_SBRK)
 template class ACE_Allocator_Adapter<SB_ALLOCATOR>;
+template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+#endif /* ! ACE_LACKS_SBRK */
+#if !defined (ACE_LACKS_SYSV_SHMEM)
 template class ACE_Allocator_Adapter<SP_ALLOCATOR>;
+#endif /* ! ACE_LACKS_SYSV_SHMEM */
 template class ACE_Allocator_Adapter<ST_ALLOCATOR>;
 template class ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>;
@@ -76,16 +81,16 @@ template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_Process_Mutex>;
 template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 #endif /* ACE_LACKS_SYSV_SHMEM */
 
-#if defined (ACE_LACKS_SBRK)
-template class ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-#else
-template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-#endif /* ACE_LACKS_SBRK */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Allocator_Adapter<L_ALLOCATOR>
 #pragma instantiate ACE_Allocator_Adapter<M_ALLOCATOR>
+#if !defined (ACE_LACKS_SBRK)
 #pragma instantiate ACE_Allocator_Adapter<SB_ALLOCATOR>
+#pragma instantiate ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>
+#endif /* ! ACE_LACKS_SYSV_SHMEM */
+#if !defined (ACE_LACKS_SBRK)
 #pragma instantiate ACE_Allocator_Adapter<SP_ALLOCATOR>
+#endif /* ! ACE_LACKS_SYSV_SHMEM */
 #pragma instantiate ACE_Allocator_Adapter<ST_ALLOCATOR>
 #pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>
@@ -103,9 +108,4 @@ template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 #pragma instantiate ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>
 #endif /* ACE_LACKS_SYSV_SHMEM */
 
-#if defined (ACE_LACKS_SBRK)
-#pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#else
-#pragma instantiate ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#endif /* ACE_LACKS_SBRK */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-- 
cgit v1.2.1