summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-04-22 08:33:38 +0000
committermsmit <msmit@remedy.nl>2009-04-22 08:33:38 +0000
commitdc0a8fb384fab4a526482e65fb7dd431433537e7 (patch)
tree5141f5479e39a43d9e0d0f7a6d93acd53fe1f84a
parentfe02b9d56e7658eda9e458e24c56c8b1d7cdd2a4 (diff)
downloadATCD-dc0a8fb384fab4a526482e65fb7dd431433537e7.tar.gz
Wed Apr 22 09:32:37 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tests/RTCORBA/Bug_3643_Regression/client.cpp: Resolved unicode compiler error.
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp4
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4e69bbd2951..17c5e02d69b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 22 09:32:37 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * tests/RTCORBA/Bug_3643_Regression/client.cpp:
+ Resolved unicode compiler error.
+
Tue Apr 21 10:17:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/RTCORBA/Bug_3643_Regression/*:
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
index a6565a33595..1f1de14fa18 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
@@ -10,7 +10,7 @@
ACE_RCSID(Thread_Pool, client, "$Id$")
-const char *ior = "file://ior_1";
+const ACE_TCHAR *ior = "file://ior_1";
int iterations = 1000;
int shutdown_server = 0;
bool decreased = false;
@@ -37,7 +37,7 @@ sched_policy_name (int sched_policy)
}
int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
{
ACE_Get_Opt get_opts (argc, argv, "xk:i:");
int c;