Sun May 13 12:48:34 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * MPC/config/rlecompressor.mpb:
          Reorder base projects

        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
          Layout chage

        * examples/AMH/Sink_Server/Client_Task.cpp:
        * examples/Load_Balancing_persistent/Identity_Client.cpp:
        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
        * examples/RTCORBA/Activity/Thread_Task.cpp:
        * examples/RTScheduling/DT_Creator.h:
        * orbsvcs/examples/Notify/ThreadPool/Consumer.cpp:
        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp:
        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp:
        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp:
        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp:
        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp:
        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp:
        * orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp:
        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp:
        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
        * orbsvcs/tests/AVStreams/Latency/pong.cpp:
        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp:
        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
        * orbsvcs/tests/Event/Basic/Observer.cpp:
        * orbsvcs/tests/Event/Basic/Reconnect.cpp:
        * orbsvcs/tests/Event/Performance/Connect.cpp:
        * orbsvcs/tests/Event/Performance/Latency.cpp:
        * orbsvcs/tests/Event/lib/Driver.cpp:
        * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp:
        * orbsvcs/tests/Notify/lib/Task_Stats.h:
        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp:
        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
        * performance-tests/Anyop/anyop.cpp:
        * performance-tests/Callback/client.cpp:
        * performance-tests/Latency/AMH_Single_Threaded/client.cpp:
        * performance-tests/Latency/AMI/client.cpp:
        * performance-tests/Latency/Collocation/Client_Task.cpp:
        * performance-tests/Latency/DII/client.cpp:
        * performance-tests/Latency/DSI/client.cpp:
        * performance-tests/Latency/Deferred/client.cpp:
        * performance-tests/Latency/Single_Threaded/client.cpp:
        * performance-tests/Latency/Thread_Per_Connection/client.cpp:
        * performance-tests/Latency/Thread_Pool/client.cpp:
        * performance-tests/POA/Create_Reference/create_reference.cpp:
        * performance-tests/POA/Implicit_Activation/client.cpp:
        * performance-tests/POA/Implicit_Activation/collocated.cpp:
        * performance-tests/Protocols/receiver.cpp:
        * performance-tests/Protocols/sender.cpp:
        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp:
        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp:
        * performance-tests/RTCorba/Oneways/Reliable/client.cpp:
        * performance-tests/RTCorba/Thread_Pool/client.cpp:
        * performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp:
        * performance-tests/Sequence_Latency/AMI/client.cpp:
        * performance-tests/Sequence_Latency/DII/client.cpp:
        * performance-tests/Sequence_Latency/DSI/client.cpp:
        * performance-tests/Sequence_Latency/Deferred/client.cpp:
        * performance-tests/Sequence_Latency/Single_Threaded/client.cpp:
        * performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp:
        * performance-tests/Sequence_Latency/Thread_Pool/client.cpp:
        * performance-tests/Throughput/Receiver.cpp:
        * performance-tests/Throughput/client.cpp:
        * tests/Portable_Interceptors/Benchmark/client.cpp:
        * tests/Smart_Proxies/Benchmark/client.cpp:
          Use ACE_High_Res_Timer::global_scale_factor_type

        * tests/OBV/ValueBox/vb_basic.idl:
          Removed invalid id

30 files changed, 133 insertions, 70 deletions

diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp
index 177b388a152..9e904527bf0 100644
--- a/TAO/performance-tests/Anyop/anyop.cpp
+++ b/TAO/performance-tests/Anyop/anyop.cpp
@@ -137,7 +137,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -204,7 +205,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           }
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -272,7 +274,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -340,7 +343,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -416,7 +420,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -493,7 +498,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -646,7 +652,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -720,7 +727,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -797,7 +805,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -867,7 +876,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
@@ -908,7 +918,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                     "Copy test finished\n"));
         ACE_DEBUG ((LM_DEBUG,
                     "High resolution timer calibration...."));
-        ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+        ACE_High_Res_Timer::global_scale_factor_type gsf =
+          ACE_High_Res_Timer::global_scale_factor ();
         ACE_DEBUG ((LM_DEBUG,
                     "done\n"));
 
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index d0768ef335f..3ddedfa0c11 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -153,7 +153,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
 
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
       ACE_Sample_History &history =
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index 198884597ff..36a200cdcf4 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -126,7 +126,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       if (do_dump_history)
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index 459a25dd27e..faf45ee0574 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -144,7 +144,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       roundtrip_handler_impl->dump_results (gsf);
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index eb272691d35..2834e419b7f 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -57,7 +57,8 @@ Client_Task::svc (void)
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_Basic_Stats stats;
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index 434637d67a8..e6fd45fd08b 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -137,7 +137,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       if (do_dump_history)
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index ced85619c85..ec4320644e4 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -125,7 +125,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       if (do_dump_history)
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index c184cc042c2..45db13bf079 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -164,7 +164,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       if (do_dump_history)
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index 198884597ff..36a200cdcf4 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -126,7 +126,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       if (do_dump_history)
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index 21eda09406c..7a3ddeacbc4 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -114,7 +114,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_Basic_Stats totals;
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index 21eda09406c..7a3ddeacbc4 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -114,7 +114,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_Basic_Stats totals;
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 82b93d6787f..cc9afe79088 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -14,7 +14,7 @@
 
 int niterations = 10000;
 int do_dump_history = 0;
-ACE_UINT32 gsf;
+ACE_High_Res_Timer::global_scale_factor_type gsf;
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index d2df111857b..ede6a1374df 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -104,7 +104,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_Sample_History activation (niterations);
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Activating %d objects\n", niterations));
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 95964eeaf45..d00dbd20d2f 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -98,7 +98,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_Sample_History activation (niterations);
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Activating %d objects\n", niterations));
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index a17407b25c3..6b1c2f62d57 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -14,7 +14,7 @@
 static const ACE_TCHAR *ior_file = ACE_TEXT ("receiver.ior");
 static int do_dump_history = 0;
 static int print_missed_invocations = 0;
-static ACE_UINT32 gsf = 0;
+static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
 
 static int
 parse_args (int argc, ACE_TCHAR **argv)
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index 7200be1d2d5..481d36b9b85 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -33,7 +33,7 @@ static int shutdown_server = 0;
 static CORBA::ULong iterations = 5;
 static CORBA::ULong invocation_rate = 5;
 static int count_missed_end_deadlines = 0;
-static ACE_UINT32 gsf = 0;
+static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
 static int do_dump_history = 0;
 static int print_missed_invocations = 0;
 static CORBA::ULong message_size = 0;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index a9fad64ef4f..f6ea53624ab 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -140,7 +140,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   try
     {
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 02d77305250..53f15a1810e 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -140,7 +140,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   try
     {
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 75f03af449f..a4ab2ea9e38 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -80,7 +80,7 @@ static int shutdown_server = 0;
 static Messaging::SyncScope sync_scope = Messaging::SYNC_WITH_TRANSPORT;
 
 // Global scale factor.
-static ACE_UINT32 gsf = 0;
+static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
 
 static void
 print_params (void)
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 61875507ba3..fc6fc58709c 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -29,7 +29,7 @@ static const ACE_TCHAR *rates_file = ACE_TEXT("rates");
 static const ACE_TCHAR *invocation_priorities_file = ACE_TEXT("empty-file");
 static int shutdown_server = 0;
 static int do_dump_history = 0;
-static ACE_UINT32 gsf = 0;
+static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
 static CORBA::ULong continuous_workers = 0;
 static int done = 0;
 static CORBA::ULong time_for_test = 10;
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index eced1d79d7b..d7ce746d9b8 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -103,7 +103,8 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -145,7 +146,8 @@ test_long_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -187,7 +189,8 @@ test_short_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -229,7 +232,8 @@ test_char_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -271,7 +275,8 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -313,7 +318,8 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index 66d160cee86..c2f8d609108 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -105,7 +105,8 @@ void test_octet_seq (Test::Roundtrip_ptr roundtrip,
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   roundtrip_handler_impl->dump_results (gsf);
@@ -150,7 +151,8 @@ void test_char_seq  (Test::Roundtrip_ptr roundtrip,
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   roundtrip_handler_impl->dump_results (gsf);
@@ -195,7 +197,8 @@ void test_long_seq  (Test::Roundtrip_ptr roundtrip,
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   roundtrip_handler_impl->dump_results (gsf);
@@ -240,7 +243,8 @@ void test_short_seq (Test::Roundtrip_ptr roundtrip,
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   roundtrip_handler_impl->dump_results (gsf);
@@ -285,7 +289,8 @@ void test_double_seq (Test::Roundtrip_ptr roundtrip,
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   roundtrip_handler_impl->dump_results (gsf);
@@ -330,7 +335,8 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   roundtrip_handler_impl->dump_results (gsf);
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index 867996dda54..c0b3bc94790 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -114,7 +114,8 @@ test_octet_seq (const CORBA::Object_var object)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -162,7 +163,8 @@ test_long_seq (const CORBA::Object_var object)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -210,7 +212,8 @@ test_short_seq (const CORBA::Object_var object)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -258,7 +261,8 @@ test_char_seq (const CORBA::Object_var object)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -306,7 +310,8 @@ test_double_seq (const CORBA::Object_var object)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -354,7 +359,8 @@ test_longlong_seq (const CORBA::Object_var object)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index 4cce1f55a25..bb900e4943f 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -102,7 +102,8 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -144,7 +145,8 @@ test_long_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -187,7 +189,8 @@ test_short_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -230,7 +233,8 @@ test_char_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -273,7 +277,8 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -316,7 +321,8 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 90a40dcf4eb..e67705b13e9 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -142,7 +142,8 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -211,7 +212,8 @@ test_long_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -280,7 +282,8 @@ test_short_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -349,7 +352,8 @@ test_char_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -418,7 +422,8 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -487,7 +492,8 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index dfcd12cfadd..6c6829f2bae 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -102,7 +102,8 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "Octet test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -144,7 +145,8 @@ test_long_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -185,7 +187,8 @@ test_short_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -227,7 +230,8 @@ test_char_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -270,7 +274,8 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
@@ -313,7 +318,8 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
   ACE_DEBUG ((LM_DEBUG, "test finished\n"));
 
   ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
 
   if (do_dump_history)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index 232915ac071..5a67e410966 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -138,7 +138,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_Basic_Stats totals;
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index 5c2bc391c26..4224adf3218 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -138,7 +138,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
+        ACE_High_Res_Timer::global_scale_factor ();
       ACE_DEBUG ((LM_DEBUG, "done\n"));
 
       ACE_Basic_Stats totals;
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 73bc1293a8e..26d04303a2d 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -51,7 +51,7 @@ Receiver::done (void)
     }
   else
     {
-      ACE_UINT32 gsf =
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
         ACE_High_Res_Timer::global_scale_factor ();
 
       ACE_hrtime_t elapsed_time =
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 061f6a99b87..fd5c633568e 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -81,7 +81,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                             1);
         }
 
-      ACE_UINT32 gsf =
+      ACE_High_Res_Timer::global_scale_factor_type gsf =
         ACE_High_Res_Timer::global_scale_factor ();
 
       Test::Message message;