summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-10-03 21:40:59 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-10-03 21:40:59 +0000
commit7414aaadf088c89c60c09aabc9df4a14f0cef408 (patch)
treebf20b3a37bb7cce0c54649f0e468c77921a6eb52
parent7bf294cde166f31bdba4a4fe85d9c8189ab634b8 (diff)
downloadATCD-7414aaadf088c89c60c09aabc9df4a14f0cef408.tar.gz
ChangeLogTag: Wed Oct 3 16:37:41 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLogs/ChangeLog-02a8
-rw-r--r--ChangeLogs/ChangeLog-03a8
-rw-r--r--ace/CDR_Stream.cpp2
4 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb6ad09968f..04e0a5e316b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct 3 16:37:41 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/CDR_Stream.cpp (read_1): Reverted this change "Wed Oct 3
+ 15:05:43 2001 Jeff Parsons <parsons@cs.wustl.edu>". This
+ change is alone not enough to fix the problem that Brad
+ reported. The sample program for the text needs to be fixed to
+ get it working right.
+
Wed Oct 3 15:05:43 2001 Jeff Parsons <parsons@cs.wustl.edu>
* ace/CDR_Stream.cpp (read_1);
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bb6ad09968f..04e0a5e316b 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Wed Oct 3 16:37:41 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/CDR_Stream.cpp (read_1): Reverted this change "Wed Oct 3
+ 15:05:43 2001 Jeff Parsons <parsons@cs.wustl.edu>". This
+ change is alone not enough to fix the problem that Brad
+ reported. The sample program for the text needs to be fixed to
+ get it working right.
+
Wed Oct 3 15:05:43 2001 Jeff Parsons <parsons@cs.wustl.edu>
* ace/CDR_Stream.cpp (read_1);
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bb6ad09968f..04e0a5e316b 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Wed Oct 3 16:37:41 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/CDR_Stream.cpp (read_1): Reverted this change "Wed Oct 3
+ 15:05:43 2001 Jeff Parsons <parsons@cs.wustl.edu>". This
+ change is alone not enough to fix the problem that Brad
+ reported. The sample program for the text needs to be fixed to
+ get it working right.
+
Wed Oct 3 15:05:43 2001 Jeff Parsons <parsons@cs.wustl.edu>
* ace/CDR_Stream.cpp (read_1);
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index a4c2da44478..cab64652ea7 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -1018,7 +1018,7 @@ ACE_InputCDR::read_boolean_array (ACE_CDR::Boolean *x,
ACE_CDR::Boolean
ACE_InputCDR::read_1 (ACE_CDR::Octet *x)
{
- if (this->rd_ptr () < this->end ())
+ if (this->rd_ptr () < this->wr_ptr ())
{
*x = *ACE_reinterpret_cast (ACE_CDR::Octet*,this->rd_ptr ());
this->start_.rd_ptr (1);