summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-02 09:44:57 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-02 09:44:57 +0000
commita3628ee2ddfc4f315a729d141554a70a41178247 (patch)
tree0c0b856d98c4fc0cf47f9d80ac65ec6324d1b79a
parentecd2ab3bc0ce2cbaa44386d927f8bb83eb821523 (diff)
downloadATCD-a3628ee2ddfc4f315a729d141554a70a41178247.tar.gz
Tue Jan 2 09:44:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/tests/ARGV_Test.cpp8
2 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d7e111d184d..1146b6a0bb3 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 2 09:44:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/ARGV_Test.cpp:
+ Fixed compile errors in unicode build
+
Mon Jan 1 21:56:50 UTC 2007 James H. Hill <hillj@isis.vanderbilt.edu>
* docs/ace_guidelines.vsmacros:
diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp
index 66bf1a97599..0e7e18f52d8 100644
--- a/ACE/tests/ARGV_Test.cpp
+++ b/ACE/tests/ARGV_Test.cpp
@@ -36,7 +36,7 @@ consume_arg (int argc, ACE_TCHAR *argv[])
}
static int
-test_simple_argv (char *argv[])
+test_simple_argv (ACE_TCHAR *argv[])
{
// From command line.
ACE_ARGV cl (argv);
@@ -182,9 +182,9 @@ test_argv_buf (void)
static int
test_argv_quotes (void)
{
- const char *argv[] = { "first without quotes",
- "'second in single quotes'",
- "\"third in double quotes\"",
+ const ACE_TCHAR *argv[] = { ACE_TEXT ("first without quotes"),
+ ACE_TEXT ("'second in single quotes'"),
+ ACE_TEXT ("\"third in double quotes\""),
0
};
int argc = 3;