initialize global_scale_factor_ to 1 if ACE_HAS_{,AIX_}HI_RES_TIMER and ACE_WIN32 are not defined

1 files changed, 8 insertions, 6 deletions

diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index eb40f2bcef6..d020859ba66 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -51,13 +51,15 @@ ACE_High_Res_Timer::get_registry_scale_factor (void)
 /* static */
 ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = ACE_High_Res_Timer::get_registry_scale_factor ();
 
+#elif defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_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_ = ACE_ONE_SECOND_IN_MSECS;
 #else
-
-// 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_ = ACE_ONE_SECOND_IN_MSECS;
-
+  // Don't convert at all, by default.  Application code may have to
+  // override this using a call to global_scale_factor ().
+  ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1;
 #endif /* ACE_WIN32 */
 
 void