diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-12 21:17:54 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-12 21:17:54 +0000 |
commit | 45f0784cd826110ae6b938e367c4acf04f8782f6 (patch) | |
tree | 785de1b8e184b89cbef690175bbac3e7676566c1 /ace/MEM_SAP.cpp | |
parent | 54aa7826823ac94aa6f68c10bc0a6f5664811362 (diff) | |
download | ATCD-45f0784cd826110ae6b938e367c4acf04f8782f6.tar.gz |
ChangeLogTag:Sat Feb 12 15:15:01 2000 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'ace/MEM_SAP.cpp')
-rw-r--r-- | ace/MEM_SAP.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp index 5215cfd3670..aba0c826de7 100644 --- a/ace/MEM_SAP.cpp +++ b/ace/MEM_SAP.cpp @@ -62,19 +62,19 @@ ACE_MEM_SAP::close_shm_malloc (const int remove) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Write_Guard<ACE_Process_Mutex>; template class ACE_Read_Guard<ACE_Process_Mutex>; -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block>; #else template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>; template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>; -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ +#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Write_Guard<ACE_Process_Mutex> #pragma instantiate ACE_Read_Guard<ACE_Process_Mutex> -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) +#if defined (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> #else #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> #pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block> -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ +#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |