diff options
| author | Steve Huston <shuston@riverace.com> | 2013-09-26 22:22:17 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2013-09-26 22:22:17 +0000 |
| commit | b37ceb9cf409603b020bca31b572fe1eeb5b575a (patch) | |
| tree | 20b336df43811fc913f93f8938195427fa1c1dee | |
| parent | b852e57cef4599700f010699106c57ce674229b1 (diff) | |
| download | ATCD-b37ceb9cf409603b020bca31b572fe1eeb5b575a.tar.gz | |
ChangeLogTag:Thu Sep 26 20:22:53 UTC 2013 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 4 | ||||
| -rw-r--r-- | ACE/ace/ACE.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2c2c3fd8d2d..b4b348b53a2 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 26 20:22:53 UTC 2013 Steve Huston <shuston@riverace.com> + + * ace/ACE.cpp (recvv_n_i): Resolve 64-bit compile warning on Windows. + Sun Sep 22 21:14:38 UTC 2013 Abdul Sowayan <sowayan@gmail.com> * include/makeinclude/platform_macosx_mavericks.GNU: diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index efc1a410657..8fd04e23998 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -1014,7 +1014,8 @@ ACE::recvv_n_i (ACE_HANDLE handle, { char *base = static_cast<char *> (iov[s].iov_base); iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; + // This blind cast is safe because n < iov_len, after above loop. + iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n); } } |