diff options
| author | Steve Huston <shuston@riverace.com> | 2002-08-27 21:31:04 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-08-27 21:31:04 +0000 |
| commit | e5979b9bb5ab1d4c001e784e84543c75870d0217 (patch) | |
| tree | cc56deb285a7e2d76e0483b99319d433aa941e54 | |
| parent | 8deeb9c0a6b1c02da5380d045f9a48adc31e5c2d (diff) | |
| download | ATCD-e5979b9bb5ab1d4c001e784e84543c75870d0217.tar.gz | |
ChangeLogTag:Tue Aug 27 17:25:39 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 4 | ||||
| -rw-r--r-- | ace/WIN32_Proactor.cpp | 21 | ||||
| -rw-r--r-- | ace/WIN32_Proactor.h | 16 |
4 files changed, 27 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index 0de3f8ec17a..aa38aba7324 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 27 17:25:39 2002 Steve Huston <shuston@riverace.com> + + * ace/WIN32_Proactor.{h cpp}: More u_long->size_t corrections. + Tue Aug 27 16:50:41 2002 Steve Huston <shuston@riverace.com> * tests/Proactor_Test.cpp: Fixed mismatched printf formats for diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0de3f8ec17a..aa38aba7324 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,7 @@ +Tue Aug 27 17:25:39 2002 Steve Huston <shuston@riverace.com> + + * ace/WIN32_Proactor.{h cpp}: More u_long->size_t corrections. + Tue Aug 27 16:50:41 2002 Steve Huston <shuston@riverace.com> * tests/Proactor_Test.cpp: Fixed mismatched printf formats for diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp index e502b9bef4c..28b06a7eba4 100644 --- a/ace/WIN32_Proactor.cpp +++ b/ace/WIN32_Proactor.cpp @@ -242,7 +242,7 @@ ACE_Asynch_Read_Stream_Result_Impl * ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_read, + size_t bytes_to_read, const void* act, ACE_HANDLE event, int priority, @@ -266,7 +266,7 @@ ACE_Asynch_Write_Stream_Result_Impl * ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_write, + size_t bytes_to_write, const void* act, ACE_HANDLE event, int priority, @@ -290,7 +290,7 @@ ACE_Asynch_Read_File_Result_Impl * ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_read, + size_t bytes_to_read, const void* act, u_long offset, u_long offset_high, @@ -318,7 +318,7 @@ ACE_Asynch_Write_File_Result_Impl * ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_write, + size_t bytes_to_write, const void* act, u_long offset, u_long offset_high, @@ -401,7 +401,7 @@ ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler, ACE_HANDLE listen_handle, ACE_HANDLE accept_handle, ACE_Message_Block &message_block, - u_long bytes_to_read, + size_t bytes_to_read, const void* act, ACE_HANDLE event, int priority, @@ -447,10 +447,10 @@ ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler, ACE_HANDLE socket, ACE_HANDLE file, ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - u_long bytes_to_write, + size_t bytes_to_write, u_long offset, u_long offset_high, - u_long bytes_per_send, + size_t bytes_per_send, u_long flags, const void *act, ACE_HANDLE event, @@ -624,7 +624,8 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) result_err = errno ; this->application_specific_code (asynch_result, - bytes_transferred, + ACE_static_cast (size_t, + bytes_transferred), (void *) completion_key, result_err); } @@ -633,7 +634,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) void ACE_WIN32_Proactor::application_specific_code (ACE_WIN32_Asynch_Result *asynch_result, - u_long bytes_transferred, + size_t bytes_transferred, const void *completion_key, u_long error) { @@ -669,7 +670,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) // to the ::PostQueuedCompletionStatus() // error will be extracted later in handle_events() - u_long bytes_transferred = 0; + size_t bytes_transferred = 0; const void * completion_key = 0 ; if ( result != 0 ) diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h index 8c6d34c6697..95001953995 100644 --- a/ace/WIN32_Proactor.h +++ b/ace/WIN32_Proactor.h @@ -125,7 +125,7 @@ public: virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_read, + size_t bytes_to_read, const void* act, ACE_HANDLE event, int priority, @@ -134,7 +134,7 @@ public: virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_write, + size_t bytes_to_write, const void* act, ACE_HANDLE event, int priority, @@ -143,7 +143,7 @@ public: virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_read, + size_t bytes_to_read, const void* act, u_long offset, u_long offset_high, @@ -154,7 +154,7 @@ public: virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, - u_long bytes_to_write, + size_t bytes_to_write, const void* act, u_long offset, u_long offset_high, @@ -189,7 +189,7 @@ public: ACE_HANDLE listen_handle, ACE_HANDLE accept_handle, ACE_Message_Block &message_block, - u_long bytes_to_read, + size_t bytes_to_read, const void* act, ACE_HANDLE event, int priority, @@ -207,10 +207,10 @@ public: ACE_HANDLE socket, ACE_HANDLE file, ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - u_long bytes_to_write, + size_t bytes_to_write, u_long offset, u_long offset_high, - u_long bytes_per_send, + size_t bytes_per_send, u_long flags, const void *act, ACE_HANDLE event, @@ -248,7 +248,7 @@ protected: /// Protect against structured exceptions caused by user code when /// dispatching handles. void application_specific_code (ACE_WIN32_Asynch_Result *asynch_result, - u_long bytes_transferred, + size_t bytes_transferred, const void *completion_key, u_long error); |