diff options
Diffstat (limited to 'tests/Malloc_Test.cpp')
| -rw-r--r-- | tests/Malloc_Test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp index c523f28c0d8..eeb50423d48 100644 --- a/tests/Malloc_Test.cpp +++ b/tests/Malloc_Test.cpp @@ -344,26 +344,26 @@ main (int argc, ASYS_TCHAR *[]) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) template class auto_ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >; template class ACE_Auto_Basic_Ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >; #else template class auto_ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >; template class ACE_Auto_Basic_Ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >; -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ +#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ template class ACE_Based_Pointer<Test_Data>; template class ACE_Based_Pointer_Basic<Test_Data>; template class ACE_Based_Pointer_Basic<long>; template class ACE_Based_Pointer_Basic<Long_Test>; template class ACE_Based_Pointer<Long_Test>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) +#if (ACE_HAS_POSITION_INDEPENDENT_MALLOC == 1) #pragma instantiate auto_ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> > #pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >; #else #pragma instantiate auto_ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> > #pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >; -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ +#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #pragma instantiate ACE_Based_Pointer<Test_Data> #pragma instantiate ACE_Based_Pointer_Basic<Test_Data> #pragma instantiate ACE_Based_Pointer_Basic<long> |