Wed Oct 1 18:59:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 26 insertions, 26 deletions

diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index d49ea66752d..211fab13a24 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -269,7 +269,7 @@ ClientApp::arg_dependency_checks()
 
 int
 ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index a7632e1330b..4c69d4e6318 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -41,7 +41,7 @@ class ClientApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
@@ -63,7 +63,7 @@ class ClientApp : public TestAppBase
 
     ClientTask client_task_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
     unsigned num_servants_;
     unsigned num_csd_threads_;
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index f5f9494e95b..45218cf6d6c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -316,7 +316,7 @@ ServerApp::arg_dependency_checks()
 
 int
 ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index 1851bc8e2dc..50d125e8193 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -43,7 +43,7 @@ class ServerApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
@@ -70,9 +70,9 @@ class ServerApp : public TestAppBase
 
     ClientTask collocated_client_task_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
-    ACE_CString ior_filename_prefix_;
+    ACE_TString ior_filename_prefix_;
     unsigned num_servants_;
     unsigned num_csd_threads_;
     unsigned num_orb_threads_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 313b6bc184f..3dbb4fb8282 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -166,7 +166,7 @@ ClientApp::arg_dependency_checks()
 
 int
 ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index fc4b146d548..aa5b1ff3d9b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -31,7 +31,7 @@ class ClientApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index c93fb73ffdb..f54f0ae03c7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -277,7 +277,7 @@ ServerApp::arg_dependency_checks()
 
 int
 ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 50110625443..1e1dc4811d0 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -42,7 +42,7 @@ class ServerApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
@@ -64,9 +64,9 @@ class ServerApp : public TestAppBase
 
     ClientTask collocated_client_task_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
-    ACE_CString ior_filename_prefix_;
+    ACE_TString ior_filename_prefix_;
     unsigned num_servants_;
     unsigned num_csd_threads_;
     unsigned num_orb_threads_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 87804bf20fe..470d0d9f1a1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -267,7 +267,7 @@ ClientApp::arg_dependency_checks()
 
 int
 ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index e2bef717ebd..19e60e52a28 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -41,7 +41,7 @@ class ClientApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
@@ -63,7 +63,7 @@ class ClientApp : public TestAppBase
 
     ClientTask client_task_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
     unsigned num_servants_;
     unsigned num_csd_threads_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 23ae1f3f529..42a09151ca6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -320,7 +320,7 @@ ServerApp::arg_dependency_checks()
 
 int
 ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 622cc1d773d..0246da44cf8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -43,7 +43,7 @@ class ServerApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
@@ -70,9 +70,9 @@ class ServerApp : public TestAppBase
 
     ClientTask collocated_client_task_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
-    ACE_CString ior_filename_prefix_;
+    ACE_TString ior_filename_prefix_;
     unsigned num_servants_;
     unsigned num_csd_threads_;
     unsigned num_orb_threads_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index 87fa6a5cbed..2feb9f4cfaf 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -169,7 +169,7 @@ ClientApp::arg_dependency_checks()
 
 int
 ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index a94b74aec27..46c1390e1c9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -32,7 +32,7 @@ class ClientApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 651df39f16c..75e6882546b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -299,7 +299,7 @@ ServerApp::arg_dependency_checks()
 
 int
 ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
+                   const ACE_TCHAR* arg,
                    char        opt,
                    const char* name,
                    int         min)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index f7f739a928e..a61522a1372 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -42,7 +42,7 @@ class ServerApp : public TestAppBase
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     int set_arg(unsigned&   value,
-                 const char* arg,
+                 const ACE_TCHAR* arg,
                  char        opt,
                  const char* name,
                  int         min = 0);
@@ -64,9 +64,9 @@ class ServerApp : public TestAppBase
 
     ClientTask collocated_client_task_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
-    ACE_CString ior_filename_prefix_;
+    ACE_TString ior_filename_prefix_;
     unsigned num_servants_;
     unsigned num_csd_threads_;
     unsigned num_orb_threads_;