Updated Branches: refs/heads/master e8379b538 -> aefd9c489
cpp: TSSLServerSocket should use THRIFT_SOCKET Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/aefd9c48 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/aefd9c48 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/aefd9c48 Branch: refs/heads/master Commit: aefd9c489987a943fce16b0b4661f1bbfdc6f30e Parents: e8379b5 Author: Roger Meier <[email protected]> Authored: Sat Jan 25 19:59:27 2014 +0100 Committer: Roger Meier <[email protected]> Committed: Sat Jan 25 19:59:27 2014 +0100 ---------------------------------------------------------------------- lib/cpp/src/thrift/transport/TSSLServerSocket.cpp | 2 +- lib/cpp/src/thrift/transport/TSSLServerSocket.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/aefd9c48/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp index 4689e4a..7520e50 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp @@ -27,7 +27,7 @@ using namespace boost; /** * SSL server socket implementation. */ -TSSLServerSocket::TSSLServerSocket(int port, +TSSLServerSocket::TSSLServerSocket(THRIFT_SOCKET port, shared_ptr<TSSLSocketFactory> factory): TServerSocket(port), factory_(factory) { factory_->server(true); http://git-wip-us.apache.org/repos/asf/thrift/blob/aefd9c48/lib/cpp/src/thrift/transport/TSSLServerSocket.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.h b/lib/cpp/src/thrift/transport/TSSLServerSocket.h index 6d8e657..18a868b 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.h +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.h @@ -38,7 +38,7 @@ class TSSLServerSocket: public TServerSocket { * @param port Listening port * @param factory SSL socket factory implementation */ - TSSLServerSocket(int port, boost::shared_ptr<TSSLSocketFactory> factory); + TSSLServerSocket(THRIFT_SOCKET port, boost::shared_ptr<TSSLSocketFactory> factory); /** * Constructor. *
