diff options
Diffstat (limited to 'src/mongo/util/net')
| -rw-r--r-- | src/mongo/util/net/httpclient.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/util/net/listen.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/util/net/message_port.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/util/net/message_server_port.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/util/net/miniwebserver.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/util/net/sock.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/util/net/ssl_options.cpp | 2 |
7 files changed, 20 insertions, 1 deletions
diff --git a/src/mongo/util/net/httpclient.cpp b/src/mongo/util/net/httpclient.cpp index cf64d5f7447..ecea9bbba56 100644 --- a/src/mongo/util/net/httpclient.cpp +++ b/src/mongo/util/net/httpclient.cpp @@ -43,6 +43,9 @@ namespace mongo { + using std::string; + using std::stringstream; + //#define HD(x) cout << x << endl; #define HD(x) diff --git a/src/mongo/util/net/listen.cpp b/src/mongo/util/net/listen.cpp index ea20d07e4e6..d15161645ac 100644 --- a/src/mongo/util/net/listen.cpp +++ b/src/mongo/util/net/listen.cpp @@ -76,6 +76,9 @@ namespace mongo { using boost::shared_ptr; + using std::endl; + using std::string; + using std::vector; // ----- Listener ------- @@ -286,7 +289,7 @@ namespace mongo { } #if defined(__linux__) - _elapsedTime += max(ret, (int)(( 10000 - maxSelectTime.tv_usec ) / 1000)); + _elapsedTime += std::max(ret, (int)(( 10000 - maxSelectTime.tv_usec ) / 1000)); #else _elapsedTime += ret; // assume 1ms to grab connection. very rough #endif diff --git a/src/mongo/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp index 4fc33df7dc4..2748c61fa67 100644 --- a/src/mongo/util/net/message_port.cpp +++ b/src/mongo/util/net/message_port.cpp @@ -58,6 +58,7 @@ namespace mongo { using boost::shared_ptr; + using std::string; // if you want trace output: #define mmm(x) diff --git a/src/mongo/util/net/message_server_port.cpp b/src/mongo/util/net/message_server_port.cpp index df4d4a1ec3d..afcce360db4 100644 --- a/src/mongo/util/net/message_server_port.cpp +++ b/src/mongo/util/net/message_server_port.cpp @@ -63,6 +63,7 @@ namespace mongo { using boost::scoped_ptr; + using std::endl; namespace { diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp index 92700291944..2cbc24e099b 100644 --- a/src/mongo/util/net/miniwebserver.cpp +++ b/src/mongo/util/net/miniwebserver.cpp @@ -42,6 +42,9 @@ namespace mongo { using boost::shared_ptr; + using std::endl; + using std::stringstream; + using std::vector; MiniWebServer::MiniWebServer(const string& name, const string &ip, int port) : Listener(name, ip, port, false) diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp index 51581136620..233ebf5d9a3 100644 --- a/src/mongo/util/net/sock.cpp +++ b/src/mongo/util/net/sock.cpp @@ -61,6 +61,12 @@ namespace mongo { + using std::endl; + using std::pair; + using std::string; + using std::stringstream; + using std::vector; + MONGO_FP_DECLARE(throwSockExcep); static bool ipv6 = false; diff --git a/src/mongo/util/net/ssl_options.cpp b/src/mongo/util/net/ssl_options.cpp index f49397f49e4..c6e33a8a32a 100644 --- a/src/mongo/util/net/ssl_options.cpp +++ b/src/mongo/util/net/ssl_options.cpp @@ -40,6 +40,8 @@ namespace mongo { + using std::string; + Status addSSLServerOptions(moe::OptionSection* options) { options->addOptionChaining("net.ssl.sslOnNormalPorts", "sslOnNormalPorts", moe::Switch, "use ssl on configured ports") |