Repository: thrift Updated Branches: refs/heads/master 8c1779d67 -> 9f4f5157a
THRIFT-2367 Build failure: stdlib and boost both define uint64_t Fix: remove "using namespace boost;" Patch: Roger Meier Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/9f4f5157 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/9f4f5157 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/9f4f5157 Branch: refs/heads/master Commit: 9f4f5157a3f3a6e67be039528c4e0dbe6e716a41 Parents: 8c1779d Author: Roger Meier <[email protected]> Authored: Wed Feb 19 16:28:35 2014 +0100 Committer: Roger Meier <[email protected]> Committed: Wed Feb 19 16:28:35 2014 +0100 ---------------------------------------------------------------------- lib/cpp/src/thrift/transport/TSSLServerSocket.cpp | 8 +++----- lib/cpp/src/thrift/transport/TSSLSocket.cpp | 7 +++---- tutorial/cpp/CppClient.cpp | 2 -- tutorial/cpp/CppServer.cpp | 2 -- 4 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/9f4f5157/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 e7a0d74..45301f8 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp @@ -22,25 +22,23 @@ namespace apache { namespace thrift { namespace transport { -using namespace boost; - /** * SSL server socket implementation. */ TSSLServerSocket::TSSLServerSocket(THRIFT_SOCKET port, - shared_ptr<TSSLSocketFactory> factory): + boost::shared_ptr<TSSLSocketFactory> factory): TServerSocket(port), factory_(factory) { factory_->server(true); } TSSLServerSocket::TSSLServerSocket(int port, int sendTimeout, int recvTimeout, - shared_ptr<TSSLSocketFactory> factory): + boost::shared_ptr<TSSLSocketFactory> factory): TServerSocket(port, sendTimeout, recvTimeout), factory_(factory) { factory_->server(true); } -shared_ptr<TSocket> TSSLServerSocket::createSocket(THRIFT_SOCKET client) { +boost::shared_ptr<TSocket> TSSLServerSocket::createSocket(THRIFT_SOCKET client) { return factory_->createSocket(client); } http://git-wip-us.apache.org/repos/asf/thrift/blob/9f4f5157/lib/cpp/src/thrift/transport/TSSLSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp index 57b530f..ce971d3 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp @@ -41,7 +41,6 @@ #define OPENSSL_VERSION_NO_THREAD_ID 0x10000000L using namespace std; -using namespace boost; using namespace apache::thrift::concurrency; struct CRYPTO_dynlock_value { @@ -490,7 +489,7 @@ int TSSLSocketFactory::passwordCallback(char* password, return length; } -static shared_array<Mutex> mutexes; +static boost::shared_array<Mutex> mutexes; static void callbackLocking(int mode, int n, const char*, int) { if (mode & CRYPTO_LOCK) { @@ -534,7 +533,7 @@ void TSSLSocketFactory::initializeOpenSSL() { SSL_library_init(); SSL_load_error_strings(); // static locking - mutexes = shared_array<Mutex>(new Mutex[::CRYPTO_num_locks()]); + mutexes = boost::shared_array<Mutex>(new Mutex[::CRYPTO_num_locks()]); if (mutexes == NULL) { throw TTransportException(TTransportException::INTERNAL_ERROR, "initializeOpenSSL() failed, " @@ -592,7 +591,7 @@ void buildErrors(string& errors, int errno_copy) { } } if (errors.empty()) { - errors = "error code: " + lexical_cast<string>(errno_copy); + errors = "error code: " + boost::lexical_cast<string>(errno_copy); } } http://git-wip-us.apache.org/repos/asf/thrift/blob/9f4f5157/tutorial/cpp/CppClient.cpp ---------------------------------------------------------------------- diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp index b91df2e..4218019 100644 --- a/tutorial/cpp/CppClient.cpp +++ b/tutorial/cpp/CppClient.cpp @@ -35,8 +35,6 @@ using namespace apache::thrift::transport; using namespace tutorial; using namespace shared; -using namespace boost; - int main(int argc, char** argv) { boost::shared_ptr<TTransport> socket(new TSocket("localhost", 9090)); boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket)); http://git-wip-us.apache.org/repos/asf/thrift/blob/9f4f5157/tutorial/cpp/CppServer.cpp ---------------------------------------------------------------------- diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp index f19258c..d75b553 100644 --- a/tutorial/cpp/CppServer.cpp +++ b/tutorial/cpp/CppServer.cpp @@ -41,8 +41,6 @@ using namespace apache::thrift::server; using namespace tutorial; using namespace shared; -using namespace boost; - class CalculatorHandler : public CalculatorIf { public: CalculatorHandler() {}
