summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 18:54:22 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 18:54:22 +0000
commit8f24d82cbf9bc3ac7eb214979ea22e81987921ac (patch)
tree306f417a3e4332c63b46837ab767f83f232dcd8c
parent0a8f11a28f537d374ced76899937ee434deb602e (diff)
downloadATCD-8f24d82cbf9bc3ac7eb214979ea22e81987921ac.tar.gz
ChangeLogTag:Wed Jul 28 13:53:36 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c6
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.cpp15
2 files changed, 15 insertions, 6 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index b6effedde82..c9198ebacf3 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Wed Jul 28 13:53:36 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tests/OctetSeq/OctetSeq.cpp:
+ The test was mistakenly not using the octet sequence
+ optimizations.
+
Wed Jul 28 13:44:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* orbsvcs/examples/RtEC/Makefile:
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index a2092e66301..c7f28ecbc06 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -29,9 +29,12 @@ ACE_RCSID(OctetSeq, OctetSeq, "$Id$")
static int
test_write_octet (TAO_OutputCDR &cdr,
- char* buf, size_t bufsize)
+ char* /* buf */,
+ size_t bufsize)
{
- Test::OctetSeq os (bufsize, bufsize, (CORBA::Octet*)buf);
+ ACE_Message_Block mb (/* buf, */ bufsize);
+ mb.wr_ptr (bufsize);
+ Test::OctetSeq os (bufsize, &mb);
if ((cdr << os) == 0)
return -1;
@@ -106,8 +109,8 @@ run (char* buf, size_t bufsize,
return -1;
writing.stop_incr ();
- reading.start_incr ();
TAO_InputCDR input (output);
+ reading.start_incr ();
if (reader (input, buf, x) != 0)
return -1;
reading.stop_incr ();
@@ -163,9 +166,9 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
int n = 64;
- int lo = 64;
- int hi = 128000;
- int s = 4;
+ int lo = 128;
+ int hi = 65536;
+ int s = 32;
int quiet = 0;