diff options
| author | Steve Huston <shuston@riverace.com> | 2000-11-10 16:36:36 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2000-11-10 16:36:36 +0000 |
| commit | 5c11b4a690c4895f993cea74123760e5ae5210f7 (patch) | |
| tree | e4fb62bbcd9ac99629a6f5cbf43ef2fc519ea085 /ace/High_Res_Timer.cpp | |
| parent | 455764ab1bcf0c391ef6154e69b33e65adea02a4 (diff) | |
| download | ATCD-5c11b4a690c4895f993cea74123760e5ae5210f7.tar.gz | |
ChangeLogTag:Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace/High_Res_Timer.cpp')
| -rw-r--r-- | ace/High_Res_Timer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 122fcba474f..1787916e6c2 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -15,7 +15,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer) // For Intel platforms, a scale factor is required for // ACE_OS::gethrtime. We'll still set this to one to prevent division // by zero errors. -#if (defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_POWERPC_TIMER) || \ +#if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ defined (ACE_HAS_ALPHA_TIMER)) && \ !defined (ACE_HAS_HI_RES_TIMER) @@ -28,14 +28,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer) /* static */ ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1u; -#else /* ! (ACE_HAS_PENTIUM || ACE_HAS_POWERPC_TIMER || \ +#else /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_ALPHA_TIMER) || ACE_HAS_HI_RES_TIMER */ // A scale_factor of 1000 converts nanosecond ticks to microseconds. // That is, on these platforms, 1 tick == 1 nanosecond. /* static */ ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1000u; -#endif /* ! (ACE_HAS_PENTIUM || ACE_HAS_POWERPC_TIMER || \ +#endif /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_ALPHA_TIMER) || ACE_HAS_HI_RES_TIMER */ @@ -150,7 +150,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) ACE_UINT32 ACE_High_Res_Timer::global_scale_factor (void) { -#if (defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_POWERPC_TIMER) || \ +#if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ defined (ACE_HAS_ALPHA_TIMER)) && \ !defined (ACE_HAS_HI_RES_TIMER) && \ ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ @@ -194,7 +194,7 @@ ACE_High_Res_Timer::global_scale_factor (void) } ACE_High_Res_Timer::global_scale_factor_status_ = 1; -#endif /* (ACE_HAS_PENTIUM || ACE_HAS_POWERPC_TIMER || \ +#endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_ALPHA_TIMER) && \ ! ACE_HAS_HIGH_RES_TIMER && ((WIN32 && ! WINCE) || ghs || __GNUG__) */ |