Mon Sep 29 14:01:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 25 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9d59a8df83b..1582d697ac9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Sep 29 14:01:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2289_Regression/server.cpp
+        * tests/DiffServ/server.cpp
+        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
+        * tests/Monitor/Marshal_Buffer/client.cpp
+        * tests/Oneway_Buffering/client.cpp
+        * tests/Oneway_Timeouts/client.cpp
+        * tests/POA/EndpointPolicy/server.cpp
+        * tests/POA/TIE/client.cpp
+        * tests/RTCORBA/Diffserv/server.cpp
+          ACE_TCHAR fixes
+
 Mon Sep 29 13:35:43 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/include/ast_generator.h:
diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
index 92cf4e8cc17..bbf33626b63 100644
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ b/TAO/tests/Bug_2289_Regression/server.cpp
@@ -13,8 +13,7 @@ ACE_RCSID (Hello,
            "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
-
-const ACE_TCHAR client_ior = ACE_TEXT("file://client.ior");
+const ACE_TCHAR *client_ior = ACE_TEXT("file://client.ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
index 5fc830cde2b..419a268a3e1 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
@@ -9,8 +9,8 @@
 
 const ACE_TCHAR *output = ACE_TEXT("server.ior");
 const ACE_TCHAR *input = ACE_TEXT("file://server.ior");
-const ACE_TCHAR simple_test_output = ACE_TEXT("simple_test.ior");
-const ACE_TCHAR simple_test_input = ACE_TEXT("file://simple_test.ior");
+const ACE_TCHAR *simple_test_output = ACE_TEXT("simple_test.ior");
+const ACE_TCHAR *simple_test_input = ACE_TEXT("file://simple_test.ior");
 // static int named_orbs = 0;
 ACE_CString server_orb;
 ACE_CString client_orb;
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index 7a25cf4f7f5..18f79117157 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -91,7 +91,7 @@ Test_i::shutdown (void)
   this->orb_->shutdown (0);
 }
 
-static const ACE_TCHAR simple_servant_ior_file = ACE_TEXT("simple_servant.ior");
+static const ACE_TCHAR *simple_servant_ior_file = ACE_TEXT("simple_servant.ior");
 
 void
 create_object (PortableServer::POA_ptr poa,
diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
index 7d74e10320b..03d905b2290 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
@@ -17,7 +17,7 @@
 using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
 const ACE_TCHAR *ior_input_file = ACE_TEXT("file://test.ior");
-const ACE_TCHAR monitor_output_file = ACE_TEXT("monitor.ior");
+const ACE_TCHAR *monitor_output_file = ACE_TEXT("monitor.ior");
 
 /// Runs the ORB in a separate thread so we can listen
 /// for calls on our MC interface without blocking.
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 1237771acbe..8a3362dc2ea 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -11,8 +11,8 @@
 
 ACE_RCSID(Oneway_Buffering, client, "$Id$")
 
-const ACE_TCHAR server_ior = ACE_TEXT("file://server.ior");
-const ACE_TCHAR admin_ior = ACE_TEXT("file://admin.ior");
+const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior");
+const ACE_TCHAR *admin_ior = ACE_TEXT("file://admin.ior");
 int iterations = 20;
 
 int run_message_count_test = 0;
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index 404496ea290..3268fef183e 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -17,7 +17,7 @@ using namespace PortableServer;
 
 namespace
 {
-  const ACE_TCHAR non_existent_ior = ACE_TEXT("corbaloc:iiop:1.2@63.246.9.65:12345/test");
+  const ACE_TCHAR *non_existent_ior = ACE_TEXT("corbaloc:iiop:1.2@63.246.9.65:12345/test");
   const int TIME_THRESHOLD = 100; //ms
 
   int request_timeout = 0;
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index 37f73752fb4..a2770a121e4 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Hello,
 
 const ACE_TCHAR *good_ior_file = ACE_TEXT ("good.ior");
 const ACE_TCHAR *bad_ior_file = ACE_TEXT ("bad.ior");
-const ACE_TCHAR root_ior_file = ACE_TEXT("root.ior");
+const ACE_TCHAR *root_ior_file = ACE_TEXT("root.ior");
 int load_advanced_resources =
 ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory);
 
diff --git a/TAO/tests/POA/TIE/client.cpp b/TAO/tests/POA/TIE/client.cpp
index e1bac84e2ba..884f53e12bc 100644
--- a/TAO/tests/POA/TIE/client.cpp
+++ b/TAO/tests/POA/TIE/client.cpp
@@ -22,7 +22,7 @@
 
 ACE_RCSID(TIE, client, "$Id$")
 
-static char *ACE_TCHAR[7] = { 0, 0, 0, 0, 0, 0, 0 };
+static ACE_TCHAR *IOR[7] = { 0, 0, 0, 0, 0, 0, 0 };
 static int iterations = 1;
 
 static int
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index ffe9bc7b787..181fbe9f57d 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -43,8 +43,8 @@ Test_i::shutdown (void)
   this->orb_->shutdown (0);
 }
 
-static const ACE_TCHAR simple_servant_ior_file = ACE_TEXT("simple_servant.ior");
-static const ACE_TCHAR diffserv_servant_ior_file = ACE_TEXT("diffserv_servant.ior");
+static const ACE_TCHAR *simple_servant_ior_file = ACE_TEXT("simple_servant.ior");
+static const ACE_TCHAR *diffserv_servant_ior_file = ACE_TEXT("diffserv_servant.ior");
 static RTCORBA::Priority corba_priority = RTCORBA::minPriority;
 
 int