diff options
author | Roger Meier <roger@apache.org> | 2014-02-03 00:29:23 +0100 |
---|---|---|
committer | Roger Meier <roger@apache.org> | 2014-02-03 00:29:23 +0100 |
commit | 0f60bd4f54cc120836415982a8cc457a4175ce08 (patch) | |
tree | 6900d0ce86374890275de807beaa28b3bb611679 /lib/cpp/src | |
parent | 301dfa94d6465244d5970e2abdc0650b386468d5 (diff) | |
download | thrift-0f60bd4f54cc120836415982a8cc457a4175ce08.tar.gz |
THRIFT-2224 cpp: TSSLSocket.h and TSSLServerSocket.h should use the platfromsocket too
Patch: soyer
Diffstat (limited to 'lib/cpp/src')
-rw-r--r-- | lib/cpp/src/thrift/transport/TSSLServerSocket.cpp | 2 | ||||
-rw-r--r-- | lib/cpp/src/thrift/transport/TSSLServerSocket.h | 2 | ||||
-rw-r--r-- | lib/cpp/src/thrift/transport/TSSLSocket.cpp | 4 | ||||
-rw-r--r-- | lib/cpp/src/thrift/transport/TSSLSocket.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp index 7520e5083..e7a0d740e 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp @@ -40,7 +40,7 @@ TSSLServerSocket::TSSLServerSocket(int port, int sendTimeout, int recvTimeout, factory_->server(true); } -shared_ptr<TSocket> TSSLServerSocket::createSocket(int client) { +shared_ptr<TSocket> TSSLServerSocket::createSocket(THRIFT_SOCKET client) { return factory_->createSocket(client); } diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.h b/lib/cpp/src/thrift/transport/TSSLServerSocket.h index 18a868b06..3a4b44d61 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.h +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.h @@ -50,7 +50,7 @@ class TSSLServerSocket: public TServerSocket { TSSLServerSocket(int port, int sendTimeout, int recvTimeout, boost::shared_ptr<TSSLSocketFactory> factory); protected: - boost::shared_ptr<TSocket> createSocket(int socket); + boost::shared_ptr<TSocket> createSocket(THRIFT_SOCKET socket); boost::shared_ptr<TSSLSocketFactory> factory_; }; diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp index 5f39f1c4d..57b530f35 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp @@ -88,7 +88,7 @@ TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx): TSocket(), server_(false), ssl_(NULL), ctx_(ctx) { } -TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, int socket): +TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket): TSocket(socket), server_(false), ssl_(NULL), ctx_(ctx) { } @@ -376,7 +376,7 @@ boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket() { return ssl; } -boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(int socket) { +boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(THRIFT_SOCKET socket) { boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, socket)); setup(ssl); return ssl; diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.h b/lib/cpp/src/thrift/transport/TSSLSocket.h index 82a2e911d..b379d23ad 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.h +++ b/lib/cpp/src/thrift/transport/TSSLSocket.h @@ -75,7 +75,7 @@ protected: * * @param socket An existing socket */ - TSSLSocket(boost::shared_ptr<SSLContext> ctx, int socket); + TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket); /** * Constructor. * @@ -120,7 +120,7 @@ class TSSLSocketFactory { * * @param socket An existing socket. */ - virtual boost::shared_ptr<TSSLSocket> createSocket(int socket); + virtual boost::shared_ptr<TSSLSocket> createSocket(THRIFT_SOCKET socket); /** * Create an instance of TSSLSocket. * |