diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-12-19 10:29:04 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-12-19 10:29:04 +0000 |
| commit | 38e0fee4969b14a43a08160a086730b146dbc0ca (patch) | |
| tree | fa98293a8d34b630f2e855b920b0e912c824a141 | |
| parent | 8679861a8728c8031bd27eefd26259b1e7c4f737 (diff) | |
| download | ATCD-38e0fee4969b14a43a08160a086730b146dbc0ca.tar.gz | |
Mon Dec 19 10:27:45 UTC 2011 Martin Corino <mcorino@remedy.nl>
* tests/Time_Policy/main.cpp:
Added preprocessor tests to detect properly configured HR
timer support.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tests/Time_Policy/main.cpp | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5997b58fad4..21b29559686 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 19 10:27:45 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tests/Time_Policy/main.cpp: + + Added preprocessor tests to detect properly configured HR timer support. + Sat Dec 17 18:13:40 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: diff --git a/TAO/tests/Time_Policy/main.cpp b/TAO/tests/Time_Policy/main.cpp index 93fed1dcd7d..b341ffd34a1 100644 --- a/TAO/tests/Time_Policy/main.cpp +++ b/TAO/tests/Time_Policy/main.cpp @@ -22,7 +22,15 @@ #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" -#if (TAO_HAS_TIME_POLICY == 1) +#if (TAO_HAS_TIME_POLICY == 1) && \ + (defined (ACE_HAS_HI_RES_TIMER) || \ + defined (ACE_HAS_AIX_HI_RES_TIMER) || \ + defined (ACE_WIN32) || \ + (defined (ghs) && defined (ACE_HAS_PENTIUM)) || \ + ((defined (__GNUG__) || defined (__INTEL_COMPILER)) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)) || \ + (defined (linux) && defined (ACE_HAS_ALPHA_TIMER)) || \ + (defined (ACE_HAS_POWERPC_TIMER) && (defined (ghs) || defined (__GNUG__))) || \ + (defined (ACE_HAS_CLOCK_GETTIME) && defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC))) #if defined(TAO_USE_HR_TIME_POLICY_STRATEGY) bool uses_hr_time = true; |