diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2011-04-14 19:17:03 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2011-04-14 19:17:03 +0000 |
| commit | 5abb66b6f462db96a1c146f289258ddfd4366158 (patch) | |
| tree | 33018dd438618300fb1369b7b8a2bab66e4f1216 /ACE | |
| parent | deb1a0691f404eae0194012560c9bed2077f799b (diff) | |
| download | ATCD-5abb66b6f462db96a1c146f289258ddfd4366158.tar.gz | |
Thu Apr 14 19:17:04 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* tests/Bug_3943_Regression_Test.cpp:
Scoreboard cleanup. "small" appears to be a reserved word on some
win32 builds.
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/tests/Bug_3943_Regression_Test.cpp | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index b78ad4aec07..185d357a710 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 14 19:17:04 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Bug_3943_Regression_Test.cpp: + + Scoreboard cleanup. "small" appears to be a reserved word on some + win32 builds. + Thu Apr 14 09:27:20 UTC 2011 Olli Savia <ops@iki.fi> * include/makeinclude/platform_freebsd.GNU: diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index d97cc0084ca..a5646d1e1dd 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -434,9 +434,9 @@ Svc_Handler::send_data (void) } { - IovecGuard small(2, 0, overThreshold); + IovecGuard small_iov(2, 0, overThreshold); send_desc = ACE_TEXT ("large iovec followed by small iovec"); - result = this->send(small, send_desc, true); + result = this->send(small_iov, send_desc, true); if (!(result > 0)) { ACE_ERROR ((LM_ERROR, @@ -539,14 +539,14 @@ Svc_Handler::send_data (void) #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) { - IovecGuard small(2, 0, 0x0fffffff); + IovecGuard small_iov(2, 0, 0x0fffffff); send_desc = ACE_TEXT ("large iovec followed by small iovec"); - result = this->send(small, send_desc, true, true); - if (result < 0 || static_cast<u_long>(result) != small.totalBytes_) + result = this->send(small_iov, send_desc, true, true); + if (result < 0 || static_cast<u_long>(result) != small_iov.totalBytes_) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %s: expected %d, got %d\n"), - send_desc, small.totalBytes_, result)); + send_desc, small_iov.totalBytes_, result)); successful = false; } } |