summaryrefslogtreecommitdiff
path: root/tests/Malloc_Test.cpp
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-08-05 21:48:25 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-08-05 21:48:25 +0000
commitab65bd95e9dcedae157dd497db458b234772d780 (patch)
treee8d48894e41e5184464dd44ee2d9ee747241fa63 /tests/Malloc_Test.cpp
parente63873d6c6d1070016d7cd9d5d5433b4d035fe48 (diff)
downloadATCD-ab65bd95e9dcedae157dd497db458b234772d780.tar.gz
ChangeLogTag:Thu Aug 5 16:43:29 1999 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu>
Diffstat (limited to 'tests/Malloc_Test.cpp')
-rw-r--r--tests/Malloc_Test.cpp23
1 files changed, 14 insertions, 9 deletions
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp
index a3f05ca39f6..17235d21daf 100644
--- a/tests/Malloc_Test.cpp
+++ b/tests/Malloc_Test.cpp
@@ -29,6 +29,8 @@ USELIB("..\ace\aced.lib");
//---------------------------------------------------------------------------
#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
+#if !defined (ACE_LACKS_FORK) && !defined (ACE_WIN32)
+
typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
// Parents <ACE_Malloc> base address in shared memory.
@@ -193,7 +195,6 @@ child (void)
int
main (int argc, ASYS_TCHAR *[])
{
-#if !defined (ACE_LACKS_FORK) && !defined (ACE_WIN32)
if (argc == 1)
{
ACE_START_TEST (ASYS_TEXT ("Malloc_Test"));
@@ -225,6 +226,7 @@ main (int argc, ASYS_TCHAR *[])
p.wait ();
myallocator ()->remove ();
ACE_END_TEST;
+ return 0;
}
else
{
@@ -244,14 +246,6 @@ main (int argc, ASYS_TCHAR *[])
ACE_END_LOG;
return 0;
}
-#else
- ACE_START_TEST (ASYS_TEXT ("Malloc_Test"));
- ACE_UNUSED_ARG (argc);
- ACE_ERROR ((LM_INFO,
- ASYS_TEXT ("process creation is not supported on this platform\n")));
- ACE_END_TEST;
-#endif /* !defined (ACE_LACKS_FORK) && !defined (ACE_WIN32) */
- return 0;
}
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -274,3 +268,14 @@ template class ACE_Based_Pointer<Long_Test>;
#pragma instantiate ACE_Based_Pointer_Basic<Long>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#else
+int
+main (int argc, ASYS_TCHAR *[])
+{
+ ACE_START_TEST (ASYS_TEXT ("Malloc_Test"));
+ ACE_ERROR ((LM_INFO,
+ ASYS_TEXT ("process creation is not supported on this platform\n")));
+ ACE_END_TEST;
+ return 0;
+}
+#endif /* !defined (ACE_LACKS_FORK) && !defined (ACE_WIN32) */