diff options
| author | Steve Huston <shuston@riverace.com> | 2002-11-15 18:25:33 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-11-15 18:25:33 +0000 |
| commit | 36f9a98dc60d9e2a6b1305b1e27158b4920c4936 (patch) | |
| tree | 1bba21f1e009d6259d05c754447f4a31cc8464c1 | |
| parent | 40b8b40c73703e3d19fb48b8f5a3486c6638f690 (diff) | |
| download | ATCD-36f9a98dc60d9e2a6b1305b1e27158b4920c4936.tar.gz | |
ChangeLogTag:Fri Nov 15 13:22:41 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | tests/Proactor_Test.cpp | 20 |
3 files changed, 30 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index b9e85063aab..83102c70453 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 15 13:22:41 2002 Steve Huston <shuston@riverace.com> + + * tests/Proactor_Test.cpp: On Win32, check for canceled I/O using + ERROR_OPERATION_ABORTED instead of ECANCELED. + Fri Nov 15 16:51:11 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * ace/POSIX_CB_Proactor.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index b9e85063aab..83102c70453 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Fri Nov 15 13:22:41 2002 Steve Huston <shuston@riverace.com> + + * tests/Proactor_Test.cpp: On Win32, check for canceled I/O using + ERROR_OPERATION_ABORTED instead of ECANCELED. + Fri Nov 15 16:51:11 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * ace/POSIX_CB_Proactor.h: diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index cb51cd6167a..0d2230049a8 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -782,8 +782,13 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) else if (result.error () != 0) { ACE_Log_Priority prio; +#if defined (ACE_WIN32) + if (result.error () == ERROR_OPERATION_ABORTED) + prio = LM_DEBUG; +#else if (result.error () == ECANCELED) prio = LM_DEBUG; +#endif /* ACE_WIN32 */ else prio = LM_ERROR; ACE_Log_Msg::instance ()->errnum (result.error ()); @@ -877,8 +882,13 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) else if (result.error () != 0) { ACE_Log_Priority prio; +#if defined (ACE_WIN32) + if (result.error () == ERROR_OPERATION_ABORTED) + prio = LM_DEBUG; +#else if (result.error () == ECANCELED) prio = LM_DEBUG; +#endif /* ACE_WIN32 */ else prio = LM_ERROR; ACE_Log_Msg::instance ()->errnum (result.error ()); @@ -1559,8 +1569,13 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) else if (result.error () != 0) { ACE_Log_Priority prio; +#if defined (ACE_WIN32) + if (result.error () == ERROR_OPERATION_ABORTED) + prio = LM_DEBUG; +#else if (result.error () == ECANCELED) prio = LM_DEBUG; +#endif /* ACE_WIN32 */ else prio = LM_ERROR; ACE_Log_Msg::instance ()->errnum (result.error ()); @@ -1674,8 +1689,13 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) else if (result.error () != 0) { ACE_Log_Priority prio; +#if defined (ACE_WIN32) + if (result.error () == ERROR_OPERATION_ABORTED) + prio = LM_DEBUG; +#else if (result.error () == ECANCELED) prio = LM_DEBUG; +#endif /* ACE_WIN32 */ else prio = LM_ERROR; ACE_Log_Msg::instance ()->errnum (result.error ()); |