diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-09-14 15:33:37 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-09-14 15:33:37 +0000 |
| commit | 0674f2e3bd6c3a5710f4f9ff28956d9e7f6c887b (patch) | |
| tree | 006548b4e7bb25ff3e46e2978e589e452a035dd5 /tests | |
| parent | 328e20ebfb5d183d62d66e4812b0eb7b9d4590e1 (diff) | |
| download | ATCD-0674f2e3bd6c3a5710f4f9ff28956d9e7f6c887b.tar.gz | |
*** empty log message ***
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Time_Value_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/test_config.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp index e77191ac684..68481639bef 100644 --- a/tests/Time_Value_Test.cpp +++ b/tests/Time_Value_Test.cpp @@ -19,7 +19,7 @@ // // ============================================================================ -#include "test_config.h" +// Note, for this test the config.h file *must* come first! #include "ace/config.h" // Force test of ACE_U_LongLong class on all platforms, except ACE_WIN32. @@ -40,9 +40,9 @@ #endif /* ACE_HAS_HI_RES_TIMER || ACE_HAS_LONGLONG_T */ +#include "test_config.h" #include "ace/ACE.h" - #if ! defined (ACE_WIN32) u_long test_ace_u_longlong () diff --git a/tests/test_config.h b/tests/test_config.h index 7d004dec2ad..38c2578fe81 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -14,9 +14,13 @@ #if !defined (ACE_TEST_CONFIG_H) #define ACE_TEST_CONFIG_H +// This first #undef protects against command-line definitions. #undef ACE_NDEBUG #include "ace/OS.h" +// The second #undef protects against being reset in a config.h file. +#undef ACE_NDEBUG + #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) # include /**/ <iostream.h> # include /**/ <fstream.h> |