summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McQueen <simon.mcqueen@gmail.com>2008-10-23 10:28:26 +0000
committerSimon McQueen <simon.mcqueen@gmail.com>2008-10-23 10:28:26 +0000
commit013e8aeadd5291970b4c8fcc4cf227aa6f10f651 (patch)
treede85bf2dadcf2dfac070e26cc2db0f3b18b1b3ba
parentd4733867c967311244de9ee3bc315a78b75494f2 (diff)
downloadATCD-013e8aeadd5291970b4c8fcc4cf227aa6f10f651.tar.gz
ChangeLogTag: Thu Oct 23 10:28:43 UTC 2008 Simon McQueen <sm@prismtech.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/Bug_3471_Regression/client.cpp6
-rw-r--r--TAO/tests/Bug_3471_Regression/server.cpp6
3 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 848776bfaac..02d0a691c62 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 23 10:28:43 UTC 2008 Simon McQueen <sm@prismtech.com>
+
+ * tests/Bug_3471_Regression/client.cpp:
+ * tests/Bug_3471_Regression/server.cpp:
+
+ Wchar nonesense.
+
Thu Oct 23 09:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
diff --git a/TAO/tests/Bug_3471_Regression/client.cpp b/TAO/tests/Bug_3471_Regression/client.cpp
index 2ecc03a0a96..bc9b948ec74 100644
--- a/TAO/tests/Bug_3471_Regression/client.cpp
+++ b/TAO/tests/Bug_3471_Regression/client.cpp
@@ -5,12 +5,12 @@
ACE_RCSID(Hello, client, "$Id$")
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:");
+ ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
int c;
while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_3471_Regression/server.cpp b/TAO/tests/Bug_3471_Regression/server.cpp
index b2b4eda1d1f..cacd790a6ff 100644
--- a/TAO/tests/Bug_3471_Regression/server.cpp
+++ b/TAO/tests/Bug_3471_Regression/server.cpp
@@ -8,12 +8,12 @@ ACE_RCSID (Hello,
server,
"$Id$")
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
int c;
while ((c = get_opts ()) != -1)