diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-01 10:09:39 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-01 10:09:39 +0000 |
| commit | de5fc7eaf981d156615b0edd28912a53d1976bec (patch) | |
| tree | f4b16b8bf887032614d060650365127b6ba3bee3 | |
| parent | 08c95225a975a1bb63d8a270f3e76b6793013048 (diff) | |
| download | ATCD-de5fc7eaf981d156615b0edd28912a53d1976bec.tar.gz | |
ChangeLogTag: Fri Jun 01 10:08:00 UTC 2007 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f161e016020..62e09c76277 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Jun 01 10:08:00 UTC 2007 Simon Massey <sma@prismtech.com> + + * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp: + + Change the static_cast to a reinterprest_cast for the + defined (ACE_ENABLE_SWAP_ON_WRITE) code path to actually + compile. + Thu May 31 19:13:32 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/orbsvcs/RtecUDPAdmin.idl: diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index eb608bd497c..51bba525e67 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -582,7 +582,7 @@ WUCS4_UTF16::write_measured_wchar_array (ACE_OutputCDR & cdr, // and we don't want to allocate a new array for (size_t i = 0; i < sbpos; i++) { - char * pchar = static_cast<char *> (&sb[i]); + char * pchar = reinterpret_cast<char *> (&sb[i]); // ACE_CDR::swap_2 (pchar, pchar); // can't use swap_2 because inplace swaps are not safe // and work-arounds like copying to another buffer lose |