Fri Mar 20 19:00:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/DomainApplicationManager/Node_Locator.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
        * DAnCE/tests/NameServiceTest/srv_main.cpp
        * performance-tests/Benchmark/RoundTrip/client.cpp
        * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
        * performance-tests/Protocols/Controller/Controller.cpp
        * performance-tests/Protocols/Receiver/Receiver_exec.cpp
        * performance-tests/Protocols/Sender/Sender_exec.cpp
        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
        * tests/CIAO_ComponentServer/Basic/client.cpp
        * tools/Config_Handlers/Basic_Deployment_Data.hpp
          Fixed unicode compile problems

5 files changed, 17 insertions, 17 deletions

diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 0b98f53156c..fd67b1290b4 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -22,7 +22,7 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/Throughput_Stats.h"
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
 
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   // Parse arguments.
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:"));
   int c;
-  
+
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -53,7 +53,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         /* Could be any other parameter like -ORBSvcConf file so ignore */
        break;
       }
-      
+
   // Indicates sucessful parsing of the command line
   return 0;
 }
@@ -151,14 +151,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (do_dump_history)
         {
-          history.dump_samples ("HISTORY", gsf);
+          history.dump_samples (ACE_TEXT("HISTORY"), gsf);
         }
 
       ACE_Basic_Stats stats;
       history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
+      stats.dump_results (ACE_TEXT("Total"), gsf);
 
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+      ACE_Throughput_Stats::dump_throughput (ACE_TEXT("Total"), gsf,
                                              test_end - test_start,
                                              stats.samples_count ());
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index 95a37181c98..8896138b6ab 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -98,17 +98,17 @@ MyImpl::RoundTripClient_exec_i::start ()
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   CIAO_DEBUG ((LM_DEBUG, CLINFO"done\n"));
 
-  ACE_Env_Value<int> envar ("CIAO_DUMP_SAMPLE_HISTORY", 0);
+  ACE_Env_Value<int> envar (ACE_TEXT("CIAO_DUMP_SAMPLE_HISTORY"), 0);
   if (envar != 0)
     {
-      history.dump_samples ("HISTORY", gsf);
+      history.dump_samples (ACE_TEXT("HISTORY"), gsf);
     }
 
   ACE_Basic_Stats stats;
   history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
+  stats.dump_results (ACE_TEXT("Total"), gsf);
 
-  ACE_Throughput_Stats::dump_throughput ("Total",
+  ACE_Throughput_Stats::dump_throughput (ACE_TEXT("Total"),
                                          gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 95293293f3a..a2320772c61 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -27,7 +27,7 @@ static int corba_priority = 0;
 static const char *test_type = "PACED";
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:"));
   int c;
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index 9e806b77f9c..e1bb4ca3196 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -74,7 +74,7 @@ namespace CIDL_ReceiverImpl
 
     if (do_dump_history)
       {
-        this->inter_arrival_times_->dump_samples ("Inter-arrival times", gsf);
+        this->inter_arrival_times_->dump_samples (ACE_TEXT("Inter-arrival times"), gsf);
       }
 
     ACE_Basic_Stats stats;
@@ -116,9 +116,9 @@ namespace CIDL_ReceiverImpl
                     "Session id ends %d\n",
                     this->session_id_));
 
-        stats.dump_results ("Inter-arrival times", gsf);
+        stats.dump_results (ACE_TEXT("Inter-arrival times"), gsf);
 
-        ACE_Throughput_Stats::dump_throughput ("Inter-arrival times", gsf,
+        ACE_Throughput_Stats::dump_throughput (ACE_TEXT("Inter-arrival times"), gsf,
                                               this->test_end_ - this->test_start_,
                                               stats.samples_count ());
       }
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index da68ddafb7b..942127e8d57 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -290,14 +290,14 @@ Worker::print_stats (void)
     {
       if (this->do_dump_history_)
         {
-          this->history_.dump_samples ("HISTORY", gsf);
+          this->history_.dump_samples (ACE_TEXT("HISTORY"), gsf);
         }
 
       ACE_Basic_Stats stats;
       this->history_.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
+      stats.dump_results (ACE_TEXT("Total"), gsf);
 
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+      ACE_Throughput_Stats::dump_throughput (ACE_TEXT("Total"), gsf,
                                              this->test_end_ - this->test_start_,
                                              this->iterations_);
     }