diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2001-12-27 18:38:22 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2001-12-27 18:38:22 +0000 |
| commit | ca2b7f71b4133faf486a677b3744904c0f759471 (patch) | |
| tree | 2ea5e06f611c338f8160a0c3bd36d069118926fe /cpp/src/Ice/SslConnectionOpenSSL.cpp | |
| parent | file run.py was initially added on branch IceThread. (diff) | |
| download | ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.bz2 ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.xz ice-ca2b7f71b4133faf486a677b3744904c0f759471.zip | |
IceThread merge.
Diffstat (limited to 'cpp/src/Ice/SslConnectionOpenSSL.cpp')
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSL.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp index 5eae3270133..78c4f0ceb3c 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp @@ -15,7 +15,6 @@ #include <string> #include <sstream> #include <Ice/Network.h> -#include <JTC/JTC.h> #include <Ice/Security.h> #include <Ice/SecurityException.h> #include <Ice/SslConnection.h> @@ -286,7 +285,7 @@ IceSecurity::Ssl::OpenSSL::Connection::protocolWrite() int IceSecurity::Ssl::OpenSSL::Connection::readInBuffer(Buffer& buf) { - JTCSyncT<JTCMutex> sync(_inBufferMutex); + IceUtil::Mutex::Lock sync(_inBufferMutex); ICE_METHOD_INV("OpenSSL::Connection::readInBuffer()"); @@ -335,7 +334,7 @@ IceSecurity::Ssl::OpenSSL::Connection::readSelect(int timeout) ICE_METHOD_INV("OpenSSL::Connection::readSelect()"); int ret; - int fd = SSL_get_fd(_sslConnection); + SOCKET fd = SSL_get_fd(_sslConnection); fd_set rFdSet; struct timeval tv; @@ -388,7 +387,7 @@ IceSecurity::Ssl::OpenSSL::Connection::writeSelect(int timeout) ICE_METHOD_INV("OpenSSL::Connection::writeSelect()"); int ret; - int fd = SSL_get_fd(_sslConnection); + SOCKET fd = SSL_get_fd(_sslConnection); fd_set wFdSet; struct timeval tv; |