diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | tests/High_Res_Timer_Test.cpp | 6 |
4 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c887e1206c8..c11ca374ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 15 16:58:08 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/High_Res_Timer_Test.cpp: Fixed compile problem with Sun CC + 4.2. + Fri Sep 14 05:28:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * THANKS: We now have over 1,300 contributors to ACE+TAO! diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index c887e1206c8..c11ca374ec3 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Sat Sep 15 16:58:08 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/High_Res_Timer_Test.cpp: Fixed compile problem with Sun CC + 4.2. + Fri Sep 14 05:28:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * THANKS: We now have over 1,300 contributors to ACE+TAO! diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c887e1206c8..c11ca374ec3 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Sat Sep 15 16:58:08 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/High_Res_Timer_Test.cpp: Fixed compile problem with Sun CC + 4.2. + Fri Sep 14 05:28:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * THANKS: We now have over 1,300 contributors to ACE+TAO! diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index b1c5c3dc0cc..5e1b3aab578 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -54,9 +54,9 @@ check_micro_nano (ACE_hrtime_t microinterval, ACE_hrtime_t nanointerval) const u_int threshold = 8 /* promille */; microinterval *= 1000u; - const ACE_hrtime_t hr_difference = (microinterval > nanointerval ? - microinterval - nanointerval : - nanointerval - microinterval ); + ACE_hrtime_t hr_difference = (microinterval > nanointerval ? + microinterval - nanointerval : + nanointerval - microinterval ); const u_int difference = ACE_U64_TO_U32 (hr_difference); if (nanointerval == 0) nanointerval = 1; // Prevent divide-by-zero |