diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-31 13:19:22 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-31 13:19:22 +0000 |
| commit | 064ad43902617c4ec1d51edfaccc348687debdc7 (patch) | |
| tree | be88bdcadaceb030f8eb01e6ac558cc3e23a2896 | |
| parent | 523bb41e7896d322d3d66acfd269876a73182a4e (diff) | |
| download | ATCD-064ad43902617c4ec1d51edfaccc348687debdc7.tar.gz | |
ChangeLogTag: Thu May 31 13:17:00 UTC 2007 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_Base.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aa42e9a7fb3..f334b26f05a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu May 31 13:17:00 UTC 2007 Simon Massey <sma@prismtech.com> + + * tao/GIOP_Message_Base.cpp: + + Change the constness of the bodylen local variable to allow + for the defined (ACE_ENABLE_SWAP_ON_WRITE) code path to actually + compile. + Wed May 30 23:10:45 UTC 2007 Scott Harris <harris_s@ociweb.com> * TAO_IDL/fe/idl.ll: diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index edcc0d4bc1c..014e61a1cf0 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -256,7 +256,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream) // this particular environment and that isn't handled by the // networking infrastructure (e.g., IPSEC). - CORBA::ULong const bodylen = static_cast <CORBA::ULong> + CORBA::ULong bodylen = static_cast <CORBA::ULong> (total_len - TAO_GIOP_MESSAGE_HEADER_LEN); #if !defined (ACE_ENABLE_SWAP_ON_WRITE) |