diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-03 17:43:36 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-03 17:43:36 +0000 |
| commit | 8c403460be5b4cf084ea66a98016346a7465c875 (patch) | |
| tree | a32a5b135771c7bd524b693ac15f7acdb1c2c8af | |
| parent | c6193b87cd474d1a500ebfceed3bdb078b1c5451 (diff) | |
| download | ATCD-8c403460be5b4cf084ea66a98016346a7465c875.tar.gz | |
ChangeLogTag: Fri Sep 3 12:41:36 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Object_KeyC.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6d09bcd62f5..e6e841af1c7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Sep 3 12:41:36 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Object_KeyC.cpp: + + Fixed hand-crafted code to compile when + TAO_NO_COPY_OCTET_SEQUENCES is defined as 0. + Fri Sep 3 10:17:32 2004 J.T. Conklin <jtc@acorntoolworks.com> * tao/Makefile.am: diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 577447e433e..7c673f39ba0 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -233,7 +233,7 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key, return strm.read_octet_array (key.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + return strm.read_octet_array (key.get_buffer (), key.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } |