diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-04-04 08:38:38 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-04-04 08:38:38 +0000 |
| commit | 1427f2f0d3ddda055166979be623f1d26c95626a (patch) | |
| tree | 3e7a65fe4354b33521975cec78d26210f488a200 | |
| parent | d6a0f33e2924696eab8597fc64dc36e435894551 (diff) | |
| download | ATCD-1427f2f0d3ddda055166979be623f1d26c95626a.tar.gz | |
ChangeLogTag:Thu Apr 4 08:32:26 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/CDR_Stream.cpp | 2 |
4 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 660ec930665..657e2206628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Apr 4 08:32:26 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/CDRStream.cpp (ctor): + Modified default ctor to always add ACE_CDR::MAX_ALIGNMENT to + the size parameter since it is always required since the + subsequent call to ACE_CDR::mb_align() might advance the + (rd|wr)_ptr's up to ACE_CDR::MAX_ALIGNMENT-1 bytes. + Wed Apr 3 18:01:33 2002 Steve Huston <shuston@riverace.com> * ace/SOCK_Dgram.cpp (shared_open): Add PF_INET6 to the test for diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 660ec930665..657e2206628 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu Apr 4 08:32:26 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/CDRStream.cpp (ctor): + Modified default ctor to always add ACE_CDR::MAX_ALIGNMENT to + the size parameter since it is always required since the + subsequent call to ACE_CDR::mb_align() might advance the + (rd|wr)_ptr's up to ACE_CDR::MAX_ALIGNMENT-1 bytes. + Wed Apr 3 18:01:33 2002 Steve Huston <shuston@riverace.com> * ace/SOCK_Dgram.cpp (shared_open): Add PF_INET6 to the test for diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 660ec930665..657e2206628 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Thu Apr 4 08:32:26 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/CDRStream.cpp (ctor): + Modified default ctor to always add ACE_CDR::MAX_ALIGNMENT to + the size parameter since it is always required since the + subsequent call to ACE_CDR::mb_align() might advance the + (rd|wr)_ptr's up to ACE_CDR::MAX_ALIGNMENT-1 bytes. + Wed Apr 3 18:01:33 2002 Steve Huston <shuston@riverace.com> * ace/SOCK_Dgram.cpp (shared_open): Add PF_INET6 to the test for diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp index 77804aa92a8..e5dbdec4ba0 100644 --- a/ace/CDR_Stream.cpp +++ b/ace/CDR_Stream.cpp @@ -21,7 +21,7 @@ ACE_OutputCDR::ACE_OutputCDR (size_t size, size_t memcpy_tradeoff, ACE_CDR::Octet major_version, ACE_CDR::Octet minor_version) - : start_ (size ? size : ACE_CDR::DEFAULT_BUFSIZE + ACE_CDR::MAX_ALIGNMENT, + : start_ ((size ? size : (size_t) ACE_CDR::DEFAULT_BUFSIZE) + ACE_CDR::MAX_ALIGNMENT, ACE_Message_Block::MB_DATA, 0, 0, |