diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-09-20 13:22:09 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-09-20 13:22:09 +0000 |
| commit | 153fc435cae3d42dd981a6c192d076ce01a8ef1d (patch) | |
| tree | 5c6db3fdee45d7eb7338f235d606797a204a54ef | |
| parent | 54a4d3e9c2c9f136dee6f7aba98a24b032defaa3 (diff) | |
| download | ATCD-153fc435cae3d42dd981a6c192d076ce01a8ef1d.tar.gz | |
reverted to test ACE_U_LongLong on all platforms except WIN32
| -rw-r--r-- | tests/Time_Value_Test.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp index e91ccc862de..b94f6df07bd 100644 --- a/tests/Time_Value_Test.cpp +++ b/tests/Time_Value_Test.cpp @@ -22,10 +22,11 @@ // Note, for this test the config.h file *must* come first! #include "ace/config.h" -#if defined (ACE_HAS_STHREADS) -// Force test of ACE_U_LongLong class on Solaris only, just so we -// know that its well-tested. - +// Force test of ACE_U_LongLong class on all platforms except ACE_WIN32. +// (ACE_U_LongLong isn't used on ACE_WIN32. And the ACE_U_LongLong +// declaration is in an inconvenient place on ace/OS.h to play this +// game on ACE_WIN32.) +#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_LONGLONG_T) # if defined (ACE_HAS_HI_RES_TIMER) # undef ACE_HAS_HI_RES_TIMER # endif /* ACE_HAS_HI_RES_TIMER */ @@ -37,12 +38,12 @@ // Force inlining, in case ACE_U_LongLong member function // definitions are not in libACE. # define __ACE_INLINE__ -#endif /* ACE_HAS_STHREADS */ +#endif /* ACE_HAS_HI_RES_TIMER || ACE_HAS_LONGLONG_T */ #include "test_config.h" #include "ace/ACE.h" -#if (!defined (ACE_HAS_HI_RES_TIMER) && !defined (ACE_HAS_LONGLONG_T)) || defined (ACE_HAS_STHREADS) +#if !defined (ACE_WIN32) u_long test_ace_u_longlong () { @@ -88,7 +89,7 @@ test_ace_u_longlong () return errors; } -#endif /* (! ACE_HAS_HI_RES_TIMER && ! ACE_HAS_LONGLONG_T) || ACE_HAS_STHREADS */ +#endif /* ! ACE_WIN32 */ int @@ -118,9 +119,9 @@ main (int, char *[]) ACE_ASSERT (tv6 == tv1); ACE_ASSERT (tv5 == tv7); -#if (!defined (ACE_HAS_HI_RES_TIMER) && !defined (ACE_HAS_LONGLONG_T)) || defined (ACE_HAS_STHREADS) +#if !defined (ACE_WIN32) if (test_ace_u_longlong () != 0) ++ret; -#endif /* (! ACE_HAS_HI_RES_TIMER && ! ACE_HAS_LONGLONG_T) || ACE_HAS_STHREADS */ +#endif /* ! ACE_WIN32 */ ACE_END_TEST; return ret; |