Thu Sep 25 20:28:39 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 32 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d0b98d72a60..f70ee365ec5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Sep 25 20:28:39 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AMI/server.cpp
+        * tests/Portable_Interceptors/Benchmark/client.cpp
+        * tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+        * tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
+        * tests/Portable_Interceptors/Benchmark/marker.cpp
+        * tests/Portable_Interceptors/Benchmark/marker.h
+        * tests/Portable_Interceptors/Benchmark/server.cpp
+        * tests/Portable_Interceptors/Bug_1559/client.cpp
+        * tests/Portable_Interceptors/Bug_1559/server.cpp
+          ACE_TCHAR changes
+
 Thu Sep 25 20:19:39 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/File_IO/client.cpp:
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index ea87ffb8d39..3a17e6a96c3 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (Portable_Interceptors,
            "$Id$")
 
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
index 4d79250c2cb..d92a5761c36 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
@@ -8,13 +8,13 @@
 
 ACE_RCSID (Benchmark, Interceptor_Type, "$Id$")
 
-void get_interceptor_type (int argc, char *argv[],
+void get_interceptor_type (int argc, ACE_TCHAR *argv[],
                            int &interceptor_type)
 {
   interceptor_type = IT_NONE;
   for (int i = 1; i < argc - 1; ++i)
     {
-      if (ACE_OS_String::strcmp (argv[i], "-r") == 0)
+      if (ACE_OS_String::strcmp (argv[i], ACE_TEXT ("-r")) == 0)
         {
           if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("none")) == 0)
             interceptor_type = IT_NONE;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
index aed618939fa..b8e03992c7e 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
@@ -26,7 +26,7 @@ enum Interceptor_Type
   IT_DYNAMIC
 };
 
-void get_interceptor_type (int argc, char *argv[],
+void get_interceptor_type (int argc, ACE_TCHAR *argv[],
                            int &interceptor_type);
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 7de9a0500ca..1ecdb680548 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (Benchmark,
            client,
            "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int niterations = 5;
 int register_interceptor = 1;
 
@@ -83,7 +83,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
     }
 
-  marker.dump_stats ("Ready method  ", gsf, 1);
+  marker.dump_stats (ACE_TEXT ("Ready method  "), gsf, 1);
 
   try
     {
@@ -108,7 +108,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server)
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
-      marker.dump_stats ("Authenticate method  ", gsf, 2);
+      marker.dump_stats (ACE_TEXT ("Authenticate method  "), gsf, 2);
     }
   catch (const Test_Interceptors::Invalid&)
     {
@@ -144,7 +144,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server)
 
     }
 
-  marker.dump_stats ("update records  method  ", gsf, 3);
+  marker.dump_stats (ACE_TEXT ("update records  method  "), gsf, 3);
 }
 
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
index dda5ff3c73b..44252125f31 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
@@ -17,13 +17,13 @@ Marker::accumulate_into (ACE_Throughput_Stats &throughput,
       throughput.accumulate (this->throughput_method_update_records_);
       break;
     default:
-      break; 
+      break;
     }
-  
+
 }
 
 void
-Marker::dump_stats (const char* msg, 
+Marker::dump_stats (const ACE_TCHAR* msg,
                     ACE_UINT32 gsf,
                     int which_method)
 {
@@ -51,19 +51,19 @@ Marker::sample (ACE_hrtime_t throughput_diff,
   switch (which_method)
     {
     case 1: // method ready
-      this->throughput_method_ready_.sample (throughput_diff, 
+      this->throughput_method_ready_.sample (throughput_diff,
                                              latency_diff);
       break;
     case 2: // method authentciate
-      this->throughput_method_authenticate_.sample (throughput_diff, 
+      this->throughput_method_authenticate_.sample (throughput_diff,
                                                     latency_diff);
       break;
     case 3: // method update_records
-      this->throughput_method_update_records_.sample (throughput_diff, 
+      this->throughput_method_update_records_.sample (throughput_diff,
                                                       latency_diff);
       break;
     default:
       break;
     }
 
-} 
+}
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.h b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
index af4e899a3f9..4debcac05d0 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
@@ -13,7 +13,7 @@ class Marker
                         int which_method) const;
   // Accumulate the throughput statistics into <throughput>
 
-  void dump_stats (const char* msg,
+  void dump_stats (const ACE_TCHAR* msg,
                    ACE_UINT32 gsf,
                    int which_method);
   // Print stats
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index ffe233fae9e..c84b894a241 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -11,7 +11,7 @@
 
 ACE_RCSID(Benchmark, server, "$Id$")
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 int register_interceptor = 1;
 
 int
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index 9d9a776dada..dcd8f996c2d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -7,7 +7,7 @@
 
 ACE_RCSID(Interceptors, client, "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index 067829e33cf..54ad89dec12 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (Service_Context_Manipulation,
            server,
            "$Id$")
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])