diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-10-20 16:32:52 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-10-20 16:32:52 +0000 |
| commit | 83cd4fb34d10bed7d4a566547be8b48b16a29b63 (patch) | |
| tree | ce4c1413d7582ed0a3d7b3d4b61d3404ed54028e | |
| parent | 2bc1a6d1af890aa45023d49eebe46600fe7423e5 (diff) | |
| download | ATCD-83cd4fb34d10bed7d4a566547be8b48b16a29b63.tar.gz | |
ChangeLogTag:Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 4 | ||||
| -rw-r--r-- | tests/SPIPE_Test.cpp | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 15d54b8e548..e5b1a5ec70a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. + Sun Oct 20 10:16:23 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * examples/C++NPv2/display_logfile.cpp: Fix for single threaded diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 15d54b8e548..e5b1a5ec70a 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,7 @@ +Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. + Sun Oct 20 10:16:23 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * examples/C++NPv2/display_logfile.cpp: Fix for single threaded diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index 0634e156386..0e5e310ea2f 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -80,14 +80,15 @@ client (void *) PIPE_READMODE_BYTE) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), rendezvous, 1)); + // Write out the alphabet all at once. if (cli_stream.send_n (ACE_ALPHABET, - ACE_OS::strlen (ACE_ALPHABET)) != ACE_OS::strlen (ACE_ALPHABET)) + ACE_OS::strlen (ACE_ALPHABET)) != (ssize_t) ACE_OS::strlen (ACE_ALPHABET)) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n"))); // Write out the alphabet one byte at a time - for (c = ACE_ALPHABET; *c != '\0'; c++) - if (cli_stream.send (c, 1) == -1) + for (const char *d = ACE_ALPHABET; *d != '\0'; d++) + if (cli_stream.send (d, 1) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send"))); if (cli_stream.close () == -1) @@ -153,7 +154,7 @@ server (void *) // can stream it in one byte at a time. for (t = ACE_ALPHABET; *t; t++) { - if (new_stream.recv (buf, 1) <= 0) + if (new_stream.recv (buf, 1) <= 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("recv"), 1)); break; @@ -167,9 +168,9 @@ server (void *) // Verify that we can read the stream of individual bytes all at // once. - if (new_stream.recv (buf, sizeof(buf)) != ACE_OS::strlen (ACE_ALPHABET)) + if (new_stream.recv (buf, sizeof(buf)) != ACE_OS::strlen (ACE_ALPHABET)) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("recv"), 1)); - else + else ACE_ASSERT(memcmp(ACE_ALPHABET, buf, ACE_OS::strlen (ACE_ALPHABET)) == 0); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End of connection. Closing handle\n"))); |