diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-10 19:32:05 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-10 19:32:05 +0000 |
| commit | 0e7d8fec07b718ad4a2911d2ce41279965350781 (patch) | |
| tree | c3c7b0951fe369635d3111c5cd9375c0f5ad9ffd | |
| parent | 24260be089da8538e3dcb4bc94946a8c4bff101b (diff) | |
| download | ATCD-0e7d8fec07b718ad4a2911d2ce41279965350781.tar.gz | |
ChangeLogTag:Fri Mar 10 11:27:04 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/CDR_Stream.i | 8 |
4 files changed, 27 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f8fe64ab78f..678880135df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 10 11:27:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.i: + Fixed the << operators for ACE_OutputCDR::from_string and + ACE_OutputCDR::from_wstring. They did not work with null + strings. + Wed Mar 8 19:16:56 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/Time_Service_Test.cpp (main): Added the ASYS_TEXT macro diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f8fe64ab78f..678880135df 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Mar 10 11:27:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.i: + Fixed the << operators for ACE_OutputCDR::from_string and + ACE_OutputCDR::from_wstring. They did not work with null + strings. + Wed Mar 8 19:16:56 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/Time_Service_Test.cpp (main): Added the ASYS_TEXT macro diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f8fe64ab78f..678880135df 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Mar 10 11:27:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.i: + Fixed the << operators for ACE_OutputCDR::from_string and + ACE_OutputCDR::from_wstring. They did not work with null + strings. + Wed Mar 8 19:16:56 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/Time_Service_Test.cpp (main): Added the ASYS_TEXT macro diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index 60ce5f64052..550758f1a4b 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -1081,7 +1081,9 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x) ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) { - ACE_CDR::ULong len = ACE_OS::strlen (x.val_); + ACE_CDR::ULong len = 0; + if (x.val_ != 0) + len = ACE_OS::strlen (x.val_); os.write_string (len, x.val_); return os.good_bit () && (len <= x.bound_); } @@ -1089,7 +1091,9 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x) { - ACE_CDR::ULong len = ACE_OS::wslen (x.val_); + ACE_CDR::ULong len; + if (x.val_ != 0) + len = ACE_OS::wslen (x.val_); os.write_wstring (len, x.val_); return os.good_bit () && (len <= x.bound_); } |