diff options
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/tests/Monotonic_Manual_Event_Test.cpp | 3 | ||||
| -rw-r--r-- | ACE/tests/Monotonic_Message_Queue_Test.cpp | 3 | ||||
| -rw-r--r-- | ACE/tests/Monotonic_Task_Test.cpp | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9e32bc73e50..ebcddb72b98 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Sun Nov 11 14:26:17 UTC 2012 Martin Corino <mcorino@remedy.nl> + + * tests/Monotonic_Manual_Event_Test.cpp: + * tests/Monotonic_Message_Queue_Test.cpp: + * tests/Monotonic_Task_Test.cpp: + Further narrowing of preprocessor test to prevent running + test on unsupported platforms. + Sat Nov 10 11:35:57 UTC 2012 Martin Corino <mcorino@remedy.nl> * tests/Monotonic_Manual_Event_Test.cpp: diff --git a/ACE/tests/Monotonic_Manual_Event_Test.cpp b/ACE/tests/Monotonic_Manual_Event_Test.cpp index 461bb9bafd7..1cc973850e9 100644 --- a/ACE/tests/Monotonic_Manual_Event_Test.cpp +++ b/ACE/tests/Monotonic_Manual_Event_Test.cpp @@ -25,7 +25,8 @@ #include "ace/Atomic_Op.h" #if defined (ACE_WIN32) || \ - (!defined (ACE_LACKS_MONOTONIC_TIME) && \ + (defined (ACE_HAS_CLOCK_GETTIME) && \ + !defined (ACE_LACKS_MONOTONIC_TIME) && \ !defined (ACE_LACKS_CONDATTR) && \ (defined (_POSIX_MONOTONIC_CLOCK) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)) && \ defined (_POSIX_CLOCK_SELECTION) && !defined (ACE_LACKS_CONDATTR_SETCLOCK)) diff --git a/ACE/tests/Monotonic_Message_Queue_Test.cpp b/ACE/tests/Monotonic_Message_Queue_Test.cpp index e82afe9b2f5..641cb5a0244 100644 --- a/ACE/tests/Monotonic_Message_Queue_Test.cpp +++ b/ACE/tests/Monotonic_Message_Queue_Test.cpp @@ -35,7 +35,8 @@ #include "ace/OS_NS_unistd.h" #if defined (ACE_WIN32) || \ - (!defined (ACE_LACKS_MONOTONIC_TIME) && \ + (defined (ACE_HAS_CLOCK_GETTIME) && \ + !defined (ACE_LACKS_MONOTONIC_TIME) && \ !defined (ACE_LACKS_CONDATTR) && \ (defined (_POSIX_MONOTONIC_CLOCK) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)) && \ defined (_POSIX_CLOCK_SELECTION) && !defined (ACE_LACKS_CONDATTR_SETCLOCK)) diff --git a/ACE/tests/Monotonic_Task_Test.cpp b/ACE/tests/Monotonic_Task_Test.cpp index 15cc5d51c69..584e254d0b7 100644 --- a/ACE/tests/Monotonic_Task_Test.cpp +++ b/ACE/tests/Monotonic_Task_Test.cpp @@ -38,7 +38,8 @@ #include "ace/OS_NS_unistd.h" #if defined (ACE_WIN32) || \ - (!defined (ACE_LACKS_MONOTONIC_TIME) && \ + (defined (ACE_HAS_CLOCK_GETTIME) && \ + !defined (ACE_LACKS_MONOTONIC_TIME) && \ !defined (ACE_LACKS_CONDATTR) && \ (defined (_POSIX_MONOTONIC_CLOCK) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)) && \ defined (_POSIX_CLOCK_SELECTION) && !defined (ACE_LACKS_CONDATTR_SETCLOCK)) |