THRIFT-2367 Build failure: stdlib and boost both define uint64_t
Fix: remove "using namespace boost;"
Patch: Roger Meier
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);
}
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 @@
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 @@
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 @@
}
}
if (errors.empty()) {
- errors = "error code: " + lexical_cast<string>(errno_copy);
+ errors = "error code: " + boost::lexical_cast<string>(errno_copy);
}
}
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 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));
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 tutorial;
using namespace shared;
-using namespace boost;
-
class CalculatorHandler : public CalculatorIf {
public:
CalculatorHandler() {}