diff options
| author | Steve Huston <shuston@riverace.com> | 2005-02-15 23:47:48 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2005-02-15 23:47:48 +0000 |
| commit | 7eb8d8a8c3f72ddbb7fbffdda9e51d107723cb96 (patch) | |
| tree | 943a383915220678f91b65f06a96ec369b9bf67b | |
| parent | ccdffbe11990510ebfe9f54164181a5162a78022 (diff) | |
| download | ATCD-7eb8d8a8c3f72ddbb7fbffdda9e51d107723cb96.tar.gz | |
ChangeLogTag:Tue Feb 15 18:45:26 2005 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ace/POSIX_Asynch_IO.cpp | 6 | ||||
| -rw-r--r-- | ace/POSIX_Asynch_IO.h | 2 | ||||
| -rw-r--r-- | ace/POSIX_Proactor.cpp | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 468b8d86e3d..8300196fcd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 15 18:45:26 2005 Steve Huston <shuston@riverace.com> + + * ace/POSIX_Asynch_IO.{h cpp}: + * ace/POSIX_Proactor.cpp: Fixed compile errors resulting from + Proxy_Ptr changes, below. + Tue Feb 15 18:19:25 2005 Steve Huston <shuston@riverace.com> * ace/Asynch_IO.{h cpp}: @@ -52,6 +58,13 @@ Tue Feb 15 14:33:18 2005 J.T. Conklin <jtc@acorntoolworks.com> Add exename definition so executable is actually built. +Tue Feb 15 16:15:28 2005 Steve Huston <shuston@riverace.com> + + * examples/RMCast/Receiver.cpp: + * examples/RMCast/Sender.cpp: + * examples/TMCast/Member/member.cpp: Corrected location of includes + after they moved. + Tue Feb 15 13:34:42 2005 J.T. Conklin <jtc@acorntoolworks.com> * Makefile.am: diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp index 0dccaad9210..e03b6d8ae1b 100644 --- a/ace/POSIX_Asynch_IO.cpp +++ b/ace/POSIX_Asynch_IO.cpp @@ -359,7 +359,7 @@ ACE_POSIX_Asynch_Write_Stream_Result::handle (void) const } ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result - (ACE_Handler::Procy_Ptr &handler_proxy, + (ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, ACE_Message_Block &message_block, size_t bytes_to_write, @@ -2035,7 +2035,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void) // general <proactor> interface pointer. // Open Asynch_Read_File. - if (this->rf_.open (*this, + if (this->rf_.open (this->proxy (), this->result_->file (), 0, 0) == -1) @@ -2044,7 +2044,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void) -1); // Open Asynch_Write_Stream. - if (this->ws_.open (*this, + if (this->ws_.open (this->proxy (), this->result_->socket (), 0, 0) == -1) diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h index 2a40c48c688..405b6dc9f85 100644 --- a/ace/POSIX_Asynch_IO.h +++ b/ace/POSIX_Asynch_IO.h @@ -209,7 +209,7 @@ protected: ACE_Proactor *proactor_; /// Handler that will receive the callback. - ACE_Handler::Proxy_Ptr *handler_proxy_; + ACE_Handler::Proxy_Ptr handler_proxy_; /// I/O handle used for reading. ACE_HANDLE handle_; diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp index c23d0cccff6..3e0bbbec2f7 100644 --- a/ace/POSIX_Proactor.cpp +++ b/ace/POSIX_Proactor.cpp @@ -353,7 +353,7 @@ ACE_POSIX_Proactor::create_asynch_write_dgram (void) ACE_Asynch_Write_Dgram_Result_Impl * ACE_POSIX_Proactor::create_asynch_write_dgram_result - (ACE_Handler::Proxy_ptr &handler_proxy, + (ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, ACE_Message_Block *message_block, size_t bytes_to_write, @@ -670,7 +670,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr posix_aiocb_proactor_->set_notify_handle (this->pipe_.read_handle ()); // Open the read stream. - if (this->read_stream_.open (*this, + if (this->read_stream_.open (this->proxy (), this->pipe_.read_handle (), 0, // Completion Key 0) // Proactor |