diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/High_Res_Timer.cpp | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0b0a3eaeb7f..79778d9e475 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 18 05:42:52 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/High_Res_Timer.cpp (global_scale_factor): The INTEL compiler + can also set the global scale factor. Thanks to Chris Kohlhoff + for reporting this. + Tue Dec 17 11:22:31 2002 Phil Mesnier <mesnier_p@ociweb.com> * ace/Codeset_IBM1047.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0b0a3eaeb7f..79778d9e475 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Wed Dec 18 05:42:52 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/High_Res_Timer.cpp (global_scale_factor): The INTEL compiler + can also set the global scale factor. Thanks to Chris Kohlhoff + for reporting this. + Tue Dec 17 11:22:31 2002 Phil Mesnier <mesnier_p@ociweb.com> * ace/Codeset_IBM1047.h: diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index fb4d0b0501f..4c2b3449263 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -172,7 +172,8 @@ ACE_High_Res_Timer::global_scale_factor (void) defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \ !defined (ACE_HAS_HI_RES_TIMER) && \ ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ - defined (ghs) || defined (__GNUG__) || defined (__KCC)) + defined (ghs) || defined (__GNUG__) || defined (__KCC) || \ + defined (__INTEL_COMPILER)) // Check if the global scale factor needs to be set, and do if so. if (ACE_High_Res_Timer::global_scale_factor_status_ == 0) { |