diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2012-11-09 10:30:49 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2012-11-09 10:30:49 +0000 |
| commit | 9fa1fc4078519891e7aff3bc57f42a31991a0fda (patch) | |
| tree | 901279b8cb0f43e939aea5061c64df8144eedeae | |
| parent | d36107bc9224b2feb40a00a409ca5c0da19cd3c5 (diff) | |
| download | ATCD-9fa1fc4078519891e7aff3bc57f42a31991a0fda.tar.gz | |
ChangelogTag: Fri Nov 9 10:29:37 UTC 2012 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/tests/Monotonic_Manual_Event_Test.cpp | 6 | ||||
| -rw-r--r-- | ACE/tests/Monotonic_Message_Queue_Test.cpp | 6 | ||||
| -rw-r--r-- | ACE/tests/Monotonic_Task_Test.cpp | 6 |
4 files changed, 19 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e8fdf68fdd0..93043573bca 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 9 10:29:37 UTC 2012 Martin Corino <mcorino@remedy.nl> + + * tests/Monotonic_Manual_Event_Test.cpp: + * tests/Monotonic_Message_Queue_Test.cpp: + * tests/Monotonic_Task_Test.cpp: + Narrowing down the selection test for supported platforms. + Fri Nov 9 08:28:23 UTC 2012 Martin Corino <mcorino@remedy.nl> * ace/OS_NS_Thread.inl: diff --git a/ACE/tests/Monotonic_Manual_Event_Test.cpp b/ACE/tests/Monotonic_Manual_Event_Test.cpp index 586172aebd7..72707a96c63 100644 --- a/ACE/tests/Monotonic_Manual_Event_Test.cpp +++ b/ACE/tests/Monotonic_Manual_Event_Test.cpp @@ -25,8 +25,10 @@ #include "ace/Atomic_Op.h" #if defined (ACE_WIN32) || \ - (defined (_POSIX_MONOTONIC_CLOCK) && !defined (ACE_LACKS_MONOTONIC_TIME)) || \ - defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC) + (!defined (ACE_LACKS_MONOTONIC_TIME) && \ + !defined (ACE_LACKS_CONDATTR) && \ + (defined (_POSIX_MONOTONIC_CLOCK) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC))&& \ + defined (_POSIX_CLOCK_SELECTION)) # include "ace/Monotonic_Time_Policy.h" # if defined (ACE_WIN32) diff --git a/ACE/tests/Monotonic_Message_Queue_Test.cpp b/ACE/tests/Monotonic_Message_Queue_Test.cpp index 57e7841c053..96673b8bfe2 100644 --- a/ACE/tests/Monotonic_Message_Queue_Test.cpp +++ b/ACE/tests/Monotonic_Message_Queue_Test.cpp @@ -35,8 +35,10 @@ #include "ace/OS_NS_unistd.h" #if defined (ACE_WIN32) || \ - (defined (_POSIX_MONOTONIC_CLOCK) && !defined (ACE_LACKS_MONOTONIC_TIME)) || \ - defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC) + (!defined (ACE_LACKS_MONOTONIC_TIME) && \ + !defined (ACE_LACKS_CONDATTR) && \ + (defined (_POSIX_MONOTONIC_CLOCK) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC))&& \ + defined (_POSIX_CLOCK_SELECTION)) # if defined (ACE_WIN32) # include "ace/Date_Time.h" diff --git a/ACE/tests/Monotonic_Task_Test.cpp b/ACE/tests/Monotonic_Task_Test.cpp index 2ad30da9a75..7c815429f8e 100644 --- a/ACE/tests/Monotonic_Task_Test.cpp +++ b/ACE/tests/Monotonic_Task_Test.cpp @@ -38,8 +38,10 @@ #include "ace/OS_NS_unistd.h" #if defined (ACE_WIN32) || \ - (defined (_POSIX_MONOTONIC_CLOCK) && !defined (ACE_LACKS_MONOTONIC_TIME)) || \ - defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC) + (!defined (ACE_LACKS_MONOTONIC_TIME) && \ + !defined (ACE_LACKS_CONDATTR) && \ + (defined (_POSIX_MONOTONIC_CLOCK) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC))&& \ + defined (_POSIX_CLOCK_SELECTION)) # if defined (ACE_WIN32) # include "ace/Date_Time.h" |