diff options
Diffstat (limited to 'ACE/tests/Malloc_Test.cpp')
| -rw-r--r-- | ACE/tests/Malloc_Test.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 97c419fcfbe..c93ea9b304e 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -35,7 +35,7 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; #define MMAP_FILENAME ACE_TEXT ("test_file") #define MUTEX_NAME ACE_TEXT ("test_lock") -#if !defined (ACE_LINUX) && !defined (ACE_OPENVMS) \ +#if !defined (ACE_LINUX) \ && !defined (ACE_ANDROID) \ && !(defined (ACE_WIN32) \ && (defined (ghs) || defined (__MINGW32__) )) \ @@ -70,7 +70,7 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR; // processes. So, though the whole PI pointer thing is tested here, // it isn't actually using multiple address ranges. -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) # define CHILD_ADDR_DELTA (1024*1024) #else # define CHILD_ADDR_DELTA 0 @@ -91,15 +91,7 @@ myallocator (const void *base_addr = 0) if (static_allocator.get () == 0) { -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ #if !defined (ACE_TEST_REMAP_ON_FAULT) options.minimum_bytes_ = 512 * 1024; @@ -118,15 +110,7 @@ init_test (const void *base_addr = 0) { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS @@ -307,7 +291,7 @@ child () // virtual address on every 32 bit process. On WinNT/2k, memory above // 2Gb is reserved for the system. So, we need to check at runtime // (we want an ACE_HAS_WINNT4 == 0 ace to run on either). -// To catch any odd case arising from Pharlap and/or WinCE, do the +// To catch any odd case arising from Pharlap, do the // run time check and run the NT4-or-better code unless we're on // CE or something other than NT4 (Pharlap reports itself as NT 3.51). static void |