summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2005-02-16 16:06:04 +0000
committerSteve Huston <shuston@riverace.com>2005-02-16 16:06:04 +0000
commit8eeb4b414ace07a998a919e005024e47b69d8b34 (patch)
tree026e442afad0070a835d433443c435c5c33d6dac
parent5f40df11cbf48385b61b055758f6ea1387674560 (diff)
downloadATCD-8eeb4b414ace07a998a919e005024e47b69d8b34.tar.gz
ChangeLogTag:Wed Feb 16 11:04:29 2005 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog5
-rw-r--r--ace/SSL/SSL_Asynch_Stream.cpp68
2 files changed, 39 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 140e6b236e7..d900bac58db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 16 11:04:29 2005 Steve Huston <shuston@riverace.com>
+
+ * ace/SSL/SSL_Asynch_Stream.cpp: Corrections to use ACE_Handler::Proxy
+ instead of naked ACE_Handler pointers/references.
+
Wed Feb 16 10:19:19 2005 Steve Huston <shuston@riverace.com>
* ace/Asynch_IO.h: Remove the extraneous ACE_Handler:: qualification
diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp
index cdc13f912e2..ae8e23d152e 100644
--- a/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ace/SSL/SSL_Asynch_Stream.cpp
@@ -61,23 +61,23 @@ protected:
ACE_SSL_Asynch_Write_Stream_Result::ACE_SSL_Asynch_Write_Stream_Result
(ACE_Handler & handler,
- ACE_HANDLE handle,
- ACE_Message_Block & message_block,
- size_t bytes_to_write,
- const void * act,
- ACE_HANDLE event,
- int priority,
- int signal_number
+ ACE_HANDLE handle,
+ ACE_Message_Block & message_block,
+ size_t bytes_to_write,
+ const void * act,
+ ACE_HANDLE event,
+ int priority,
+ int signal_number
)
- : AWS_RESULT (handler,
- handle,
- message_block,
- bytes_to_write,
- act,
- event,
- priority,
- signal_number
- )
+ : AWS_RESULT (handler.proxy (),
+ handle,
+ message_block,
+ bytes_to_write,
+ act,
+ event,
+ priority,
+ signal_number
+ )
{
}
@@ -106,23 +106,23 @@ protected:
ACE_SSL_Asynch_Read_Stream_Result::ACE_SSL_Asynch_Read_Stream_Result
(ACE_Handler & handler,
- ACE_HANDLE handle,
- ACE_Message_Block & message_block,
- size_t bytes_to_read,
- const void * act,
- ACE_HANDLE event,
- int priority,
- int signal_number
+ ACE_HANDLE handle,
+ ACE_Message_Block & message_block,
+ size_t bytes_to_read,
+ const void * act,
+ ACE_HANDLE event,
+ int priority,
+ int signal_number
)
- : ARS_RESULT (handler,
- handle,
- message_block,
- bytes_to_read,
- act,
- event,
- priority,
- signal_number
- )
+ : ARS_RESULT (handler.proxy (),
+ handle,
+ message_block,
+ bytes_to_read,
+ act,
+ event,
+ priority,
+ signal_number
+ )
{
}
@@ -143,7 +143,7 @@ public:
ACE_SSL_Asynch_Result::ACE_SSL_Asynch_Result
(ACE_Handler & handler)
- : A_RESULT (handler,
+ : A_RESULT (handler.proxy (),
0, // act,
ACE_INVALID_HANDLE,
0, // Offset
@@ -160,7 +160,7 @@ ACE_SSL_Asynch_Result::complete (size_t /* bytes_transferred */,
const void * /* completion_key */,
u_long /* error */)
{
- this->handler_.handle_wakeup ();
+ this->handler_proxy_->handler ()->handle_wakeup ();
}
// ************************************************************