diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-14 16:16:26 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-14 16:16:26 +0000 |
| commit | 81fabf77f2e78200c690ca5af69ed1c7c7ea05c4 (patch) | |
| tree | 3c321a2838f02486f1ef4aebaef8c39e24c5ff1d /examples | |
| parent | ffa54ea61ac94b5478bcd85b9c7faef8c35ea5e8 (diff) | |
| download | ATCD-81fabf77f2e78200c690ca5af69ed1c7c7ea05c4.tar.gz | |
ChangeLogTag: Wed Jul 14 11:15:24 1999 David L. Levine <levine@cs.wustl.edu>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Shared_Malloc/Malloc.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/examples/Shared_Malloc/Malloc.cpp b/examples/Shared_Malloc/Malloc.cpp index 4e0bf8d224b..474e4b6d8f3 100644 --- a/examples/Shared_Malloc/Malloc.cpp +++ b/examples/Shared_Malloc/Malloc.cpp @@ -35,20 +35,20 @@ Malloc::instance (void) if (Malloc::instance_ == 0) { if (Options::instance ()->child ()) - Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>; + Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>; else if (Options::instance ()->spawn_threads ()) - { - if (Options::instance ()->use_sbrk ()) - Malloc::instance_ = new ACE_Allocator_Adapter<SB_ALLOCATOR>; - else if (Options::instance ()->use_shmem ()) - Malloc::instance_ = new ACE_Allocator_Adapter<ST_ALLOCATOR>; - else - Malloc::instance_ = new ACE_Allocator_Adapter<L_ALLOCATOR>; - } + { + if (Options::instance ()->use_sbrk ()) + Malloc::instance_ = new ACE_Allocator_Adapter<SB_ALLOCATOR>; + else if (Options::instance ()->use_shmem ()) + Malloc::instance_ = new ACE_Allocator_Adapter<ST_ALLOCATOR>; + else + Malloc::instance_ = new ACE_Allocator_Adapter<L_ALLOCATOR>; + } else if (Options::instance ()->use_mmap ()) - Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>; + Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>; else // Use Shared_Memory_Pool. - Malloc::instance_ = new ACE_Allocator_Adapter<SP_ALLOCATOR>; + Malloc::instance_ = new ACE_Allocator_Adapter<SP_ALLOCATOR>; } return Malloc::instance_; @@ -63,9 +63,11 @@ 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>; template class ACE_Read_Guard<ACE_Process_Mutex>; -template class ACE_Read_Guard<ACE_SYNCH_MUTEX>; template class ACE_Write_Guard<ACE_Process_Mutex>; +#if !defined (ACE_HAS_THREADS) +template class ACE_Read_Guard<ACE_SYNCH_MUTEX>; template class ACE_Write_Guard<ACE_SYNCH_MUTEX>; +#endif /* ! ACE_HAS_THREADS */ #if defined (ACE_LACKS_SYSV_SHMEM) template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>; @@ -88,9 +90,11 @@ template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> #pragma instantiate ACE_Read_Guard<ACE_Process_Mutex> -#pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX> #pragma instantiate ACE_Write_Guard<ACE_Process_Mutex> +#if !defined (ACE_HAS_THREADS) +#pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX> #pragma instantiate ACE_Write_Guard<ACE_SYNCH_MUTEX> +#endif /* ! ACE_HAS_THREADS */ #if defined (ACE_LACKS_SYSV_SHMEM) #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> @@ -105,4 +109,3 @@ template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX> #endif /* ACE_LACKS_SBRK */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - |