diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-10 14:16:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-10 14:16:52 +0000 |
| commit | f6b4cabde4be6667d19addc04df15a46f6913c19 (patch) | |
| tree | d2bd2f8d1c5226873f4f698f250afce753542b89 | |
| parent | 2451dd85dad769411929926fb0e07b5c63fd8ef2 (diff) | |
| download | ATCD-f6b4cabde4be6667d19addc04df15a46f6913c19.tar.gz | |
Tue Oct 10 14:16:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/CDR_Stream.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 5f0a2a4d122..354341ed074 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 10 14:16:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Stream.cpp: + Fixed incorrect comment + Tue Oct 10 12:54:00 UTC 2006 Simon Massey <sma@prismtech.com> * ace/config-win32-msvc.h: diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 2a6807df320..783730763af 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -579,7 +579,7 @@ ACE_OutputCDR::write_wchar_array_i (const ACE_CDR::WChar *x, ACE_CDR::UShort sx = static_cast<ACE_CDR::UShort> (x[i]); ACE_CDR::swap_2 (reinterpret_cast<char *> (&sx), &buf[i * 2]); } -#endif /* ACE_DISABLE_SWAP_ON_READ */ +#endif /* ACE_ENABLE_SWAP_ON_WRITE */ } else { @@ -1276,7 +1276,7 @@ ACE_InputCDR::read_wchar_array_i (ACE_CDR::WChar* x, if (length == 0) return true; char* buf = 0; - const size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ? + size_t const align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ? ACE_CDR::SHORT_ALIGN : ACE_CDR::OCTET_ALIGN; |