diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2015-05-31 15:48:23 +0200 |
|---|---|---|
| committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2015-05-31 15:48:23 +0200 |
| commit | d6922aad2c054667efede271c4198247edd6f6ad (patch) | |
| tree | 591410fe0d104781d9b2c7925c919356781a258e | |
| parent | 49b22928ee71f18f3cba0245e8b91a11e305183d (diff) | |
| download | bitcoin-d6922aad2c054667efede271c4198247edd6f6ad.tar.xz | |
[net, trivial] remove using namespace std pollution in netbase.cpp
| -rw-r--r-- | src/netbase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 41cc18d3cd..e3cb4e706f 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -35,8 +35,6 @@ #define MSG_NOSIGNAL 0 #endif -using namespace std; - // Settings static proxyType proxyInfo[NET_MAX]; static proxyType nameProxy; @@ -597,13 +595,13 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout, b bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault, int nTimeout, bool *outProxyConnectionFailed) { - string strDest; + std::string strDest; int port = portDefault; if (outProxyConnectionFailed) *outProxyConnectionFailed = false; - SplitHostPort(string(pszDest), port, strDest); + SplitHostPort(std::string(pszDest), port, strDest); proxyType nameProxy; GetNameProxy(nameProxy); |