diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-05-17 00:07:13 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-05-17 00:07:13 +0000 |
| commit | 442da99580dec27d45306c9ccdfbc1c0d05e7030 (patch) | |
| tree | 7d1d2390f440dbd99a5c4a707ff05ae010d63b5c | |
| parent | fde9e11564f4e350191483c01dbadc44f5d45750 (diff) | |
| download | ATCD-442da99580dec27d45306c9ccdfbc1c0d05e7030.tar.gz | |
ChangeLogTag:Thu May 16 17:05:19 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/SSL/SSL_Connector.cpp | 12 |
4 files changed, 27 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 8bd63d78ec5..2ed1d30a211 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu May 16 17:05:19 2002 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_Connector.cpp (handle_input, handle_output): + + Qualify the AST type with its appropriate scope. g++ requires + it. + Thu May 16 15:28:24 2002 Ossama Othman <ossama@uci.edu> * ace/SSL/SSL_Connector.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 8bd63d78ec5..2ed1d30a211 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Thu May 16 17:05:19 2002 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_Connector.cpp (handle_input, handle_output): + + Qualify the AST type with its appropriate scope. g++ requires + it. + Thu May 16 15:28:24 2002 Ossama Othman <ossama@uci.edu> * ace/SSL/SSL_Connector.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8bd63d78ec5..2ed1d30a211 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Thu May 16 17:05:19 2002 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_Connector.cpp (handle_input, handle_output): + + Qualify the AST type with its appropriate scope. g++ requires + it. + Thu May 16 15:28:24 2002 Ossama Othman <ossama@uci.edu> * ace/SSL/SSL_Connector.h: diff --git a/ace/SSL/SSL_Connector.cpp b/ace/SSL/SSL_Connector.cpp index 0cfe8cc878b..8d4e55dd3da 100644 --- a/ace/SSL/SSL_Connector.cpp +++ b/ace/SSL/SSL_Connector.cpp @@ -34,7 +34,7 @@ ACE_SSL_Connector<SVH, PR_CO_2>::handle_input (ACE_HANDLE handle) // implementation ever changes, this method may be needed. int result = 0; - AST * ast = 0; + ACE_Connector<SVH, PR_CO_2>::AST * ast = 0; if (this->handler_map_.find (handle, ast) == 0) { @@ -53,7 +53,7 @@ ACE_SSL_Connector<SVH, PR_CO_2>::handle_input (ACE_HANDLE handle) if (this->connector ().complete (new_stream, 0, tv) == 0) return this->ACE_Connector<SVH, PR_CO_2>::handle_output (handle); } - + if (errno != EWOULDBLOCK) // Connection failed. Cleanup resources. return this->ACE_Connector<SVH, PR_CO_2>::handle_input (handle); @@ -70,7 +70,7 @@ ACE_SSL_Connector<SVH, PR_CO_2>::handle_output (ACE_HANDLE handle) // The TCP connection has completed. Now complete the SSL // connection/handshake. - AST * ast = 0; + ACE_Connector<SVH, PR_CO_2>::AST * ast = 0; if (this->handler_map_.find (handle, ast) == 0) { ACE_SSL_SOCK_Stream & new_stream = ast->svc_handler ()->peer (); @@ -131,7 +131,7 @@ ACE_SSL_Strategy_Connector<SVH, PR_CO_2>::handle_input (ACE_HANDLE handle) // implementation ever changes, this method may be needed. int result = 0; - AST * ast = 0; + ACE_Connector<SVH, PR_CO_2>::AST * ast = 0; if (this->handler_map_.find (handle, ast) == 0) { @@ -150,7 +150,7 @@ ACE_SSL_Strategy_Connector<SVH, PR_CO_2>::handle_input (ACE_HANDLE handle) if (this->connector ().complete (new_stream, 0, tv) == 0) return this->ACE_Connector<SVH, PR_CO_2>::handle_output (handle); } - + if (errno != EWOULDBLOCK) // Connection failed. Cleanup resources. return this->ACE_Connector<SVH, PR_CO_2>::handle_input (handle); @@ -174,7 +174,7 @@ ACE_SSL_Strategy_Connector<SVH, PR_CO_2>::handle_output (ACE_HANDLE handle) // The TCP connection has completed. Now complete the SSL // connection/handshake. - AST * ast = 0; + ACE_Connector<SVH, PR_CO_2>::AST * ast = 0; if (this->handler_map_.find (handle, ast) == 0) { ACE_SSL_SOCK_Stream & new_stream = ast->svc_handler ()->peer (); |