summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2001-12-04 09:02:49 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2001-12-04 09:02:49 +0000
commitbcc96909dcb84bf2432859af13afd6fff836954c (patch)
tree157ce1e1960c44df925033eff81addbeabffae8f
parentcfd4bd2d7e66d16e481e947d01da598071cde698 (diff)
downloadATCD-bcc96909dcb84bf2432859af13afd6fff836954c.tar.gz
ChangeLogTag: Tue Dec 04 09:59:08 2001 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--examples/Reactor/Multicast/client.cpp16
4 files changed, 23 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 681de460c09..5c83ee01e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 4 10:00:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Reactor/Multicast/client.cpp:
+ Made this file compiling when ACE_USES_WCHAR is set
+
Mon Dec 3 18:19:11 2001 Ossama Othman <ossama@uci.edu>
* bin/fuzz.pl (check_for_id_string):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 681de460c09..5c83ee01e7f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Tue Dec 4 10:00:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Reactor/Multicast/client.cpp:
+ Made this file compiling when ACE_USES_WCHAR is set
+
Mon Dec 3 18:19:11 2001 Ossama Othman <ossama@uci.edu>
* bin/fuzz.pl (check_for_id_string):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 681de460c09..5c83ee01e7f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Tue Dec 4 10:00:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Reactor/Multicast/client.cpp:
+ Made this file compiling when ACE_USES_WCHAR is set
+
Mon Dec 3 18:19:11 2001 Ossama Othman <ossama@uci.edu>
* bin/fuzz.pl (check_for_id_string):
diff --git a/examples/Reactor/Multicast/client.cpp b/examples/Reactor/Multicast/client.cpp
index 0e0c495b813..10c16b7c24a 100644
--- a/examples/Reactor/Multicast/client.cpp
+++ b/examples/Reactor/Multicast/client.cpp
@@ -22,12 +22,12 @@ static int max_message_size = BUFSIZ;
static int iterations = 0;
static void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
{
ACE_LOG_MSG->open (argv[0]);
// Start at argv[1]
- ACE_Get_Opt getopt (argc, argv, "m:ui:", 1);
+ ACE_Get_Opt getopt (argc, argv, ACE_TEXT("m:ui:"), 1);
for (int c; (c = getopt ()) != -1; )
switch (c)
@@ -41,15 +41,15 @@ parse_args (int argc, char *argv[])
case 'u':
// usage fallthrough
default:
- ACE_ERROR ((LM_ERROR,
- "%n: -m max_message_size (in k) -i iterations\n%a",
+ ACE_ERROR ((LM_ERROR,
+ "%n: -m max_message_size (in k) -i iterations\n%a",
1));
/* NOTREACHED */
}
}
int
-main (int argc, char **argv)
+main (int argc, ACE_TCHAR **argv)
{
int user_prompt;
@@ -86,7 +86,7 @@ main (int argc, char **argv)
user_prompt = 1;
else
user_prompt = 0;
-
+
// Continually read messages from stdin and log them.
for (int count = 1;;)
@@ -99,7 +99,7 @@ main (int argc, char **argv)
if (nbytes <= 0)
break; // End of file or error.
buf[nbytes - 1] = '\0';
-
+
// Quitting?
if (user_prompt)
{
@@ -113,7 +113,7 @@ main (int argc, char **argv)
if (log.log_message (Log_Wrapper::LM_DEBUG, buf) == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n" "log_message"), -1);
ACE_DEBUG ((LM_DEBUG, "finished sending message %d\n", count++));
- }
+ }
}
ACE_DEBUG ((LM_DEBUG, "Client done.\n"));