summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-04-23 07:14:19 +0000
committermsmit <msmit@remedy.nl>2009-04-23 07:14:19 +0000
commite049d4923c9a9adba930dd9d2d8e7a5293633988 (patch)
tree98521b3d29624a361ebb28bf983a6a8bb7d1cd35
parent6c361f6565a05189d2b359a8c6690a9970a759f4 (diff)
downloadATCD-e049d4923c9a9adba930dd9d2d8e7a5293633988.tar.gz
Thu Apr 23 08:13: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.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f7de5a4d0b7..4c0cf023069 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 23 08:13:37 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * tests/RTCORBA/Bug_3643_Regression/client.cpp:
+ Resolved unicode compiler error.
+
Wed Apr 22 17:59:18 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/include/ast_sequence.h:
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
index 1f1de14fa18..d578c7336b4 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 ACE_TCHAR *ior = "file://ior_1";
+const ACE_TCHAR *ior = ACE_TEXT ("file://ior_1");
int iterations = 1000;
int shutdown_server = 0;
bool decreased = false;