diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/SSL/SSL_Asynch_Stream.cpp | 10 | ||||
| -rw-r--r-- | ace/SSL/SSL_Asynch_Stream.h | 7 |
5 files changed, 40 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3b0f37d67de..8f262c1e611 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 24 13:47:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/SSL/SSL_Asynch_Stream.h (ACE_SSL_Asynch_Stream): + * ace/SSL/SSL_Asynch_Stream.cpp: Added a open () method that + matches the signature of ACE_Service_Handler. This should fix + the warnings in Borland builds that complain about hiding + the virtual functions. + Tue Jul 24 10:56:04 2001 Ossama Othman <ossama@uci.edu> * bin/generate_doxygen.pl (TAO_DOCS): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 3b0f37d67de..8f262c1e611 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Jul 24 13:47:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/SSL/SSL_Asynch_Stream.h (ACE_SSL_Asynch_Stream): + * ace/SSL/SSL_Asynch_Stream.cpp: Added a open () method that + matches the signature of ACE_Service_Handler. This should fix + the warnings in Borland builds that complain about hiding + the virtual functions. + Tue Jul 24 10:56:04 2001 Ossama Othman <ossama@uci.edu> * bin/generate_doxygen.pl (TAO_DOCS): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 3b0f37d67de..8f262c1e611 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Tue Jul 24 13:47:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/SSL/SSL_Asynch_Stream.h (ACE_SSL_Asynch_Stream): + * ace/SSL/SSL_Asynch_Stream.cpp: Added a open () method that + matches the signature of ACE_Service_Handler. This should fix + the warnings in Borland builds that complain about hiding + the virtual functions. + Tue Jul 24 10:56:04 2001 Ossama Othman <ossama@uci.edu> * bin/generate_doxygen.pl (TAO_DOCS): diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp index 24b3398bf12..dafc7009b25 100644 --- a/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ace/SSL/SSL_Asynch_Stream.cpp @@ -217,7 +217,7 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) // done. if (this->flags_ & SF_STREAM_OPEN) // open if ((this->flags_ & SF_DELETE_ENABLE) == 0) // but .. - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-") ACE_TEXT("possible access violation ") ACE_TEXT("if proactor still handles events\n"))); @@ -384,6 +384,14 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, return 0; } +void +ACE_SSL_Asynch_Stream::open (ACE_HANDLE new_handle, + ACE_Message_Block &block) +{ + ACE_Service_Handler::open (new_handle, + block); +} + // ************************************************************ // Asynch_Operation interface // read diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h index 16470b1309e..8e90b33b7b7 100644 --- a/ace/SSL/SSL_Asynch_Stream.h +++ b/ace/SSL/SSL_Asynch_Stream.h @@ -87,6 +87,13 @@ public: const void *completion_key = 0, ACE_Proactor *proactor = 0); + /// NOTE: This method has been specifically put in place so that + /// compilers like the borland doesnt get confused between the above + /// open () call with the one in the ACE_Service_Handler, from which + /// this class is derived from.. + void open (ACE_HANDLE new_handle, + ACE_Message_Block &message_block); + int read (ACE_Message_Block &message_block, u_long num_bytes_to_read, const void *act = 0, |