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

5 files changed, 16 insertions, 8 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 302bb16f9e8..f39b060867f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -310,7 +310,8 @@ EC_Observer::dump_results (void)
   ACE_DEBUG ((LM_DEBUG, "===== Results for %d =====\n", this->id_));
 
   ACE_Throughput_Stats throughput;
-  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 ();
   for (int j = 0; j < this->n_consumers_; ++j)
     {
       this->consumers_[j]->accumulate (throughput);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 31e4d1de658..fca70e30dd4 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -91,7 +91,8 @@ EC_Reconnect::execute_test (void)
   this->execute_consumer_test ();
   this->execute_supplier_test ();
 
-  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 ();
   this->consumer_reconnect_.dump_results (ACE_TEXT("Reconnect/consumer"), gsf);
   this->supplier_reconnect_.dump_results (ACE_TEXT("Reconnect/supplier"), gsf);
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 91e0b6738a3..0a10dba7a89 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -96,7 +96,8 @@ EC_Connect::print_args (void) const
 void
 EC_Connect::dump_results (void)
 {
-  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, "\nConnect time:\n"));
   this->consumer_connect_.dump_results (ACE_TEXT("Consumer/connect"), gsf);
   this->supplier_connect_.dump_results (ACE_TEXT("Supplier/connect"), gsf);
@@ -241,7 +242,8 @@ EC_Connect::disconnect_clients (void)
                                              now - start);
         }
     }
-  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 ();
   this->consumer_disconnect_.dump_results (ACE_TEXT("Consumer/disconnect"), gsf);
   this->supplier_disconnect_.dump_results (ACE_TEXT("Supplier/disconnect"), gsf);
 }
@@ -260,7 +262,8 @@ EC_Connect::disconnect_consumers (void)
       this->consumer_disconnect_.sample (now - start_time,
                                          now - start);
     }
-  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 ();
   this->consumer_disconnect_.dump_results (ACE_TEXT("Consumer/disconnect"),
                                            gsf);
   if (this->verbose ())
@@ -281,7 +284,8 @@ EC_Connect::disconnect_suppliers (void)
       this->supplier_disconnect_.sample (now - start_time,
                                          now - start);
     }
-  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 ();
   this->supplier_disconnect_.dump_results (ACE_TEXT("Supplier/disconnect"),
                                            gsf);
   if (this->verbose ())
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 9b1f4d5bc5e..12d25b6a41c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -193,7 +193,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));
       if (do_dump_history)
         {
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 4c3d1c11106..84cc1a7c48f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -641,7 +641,8 @@ void
 EC_Driver::dump_results (void)
 {
   ACE_Throughput_Stats throughput;
-  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_TCHAR buf[BUFSIZ];
   for (int j = 0; j < this->n_consumers_; ++j)
     {