diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-06-01 09:53:35 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-06-01 09:53:45 +0200 |
| commit | e9d0d252fc57119766f5d7b58715451dd42b1ce6 (patch) | |
| tree | f83a0d441d3bfb37f7460e5e69863dbce74512e3 /src/netbase.cpp | |
| parent | Merge pull request #6193 (diff) | |
| parent | [net, trivial] remove using namespace std pollution in netbase.cpp (diff) | |
| download | discoin-e9d0d252fc57119766f5d7b58715451dd42b1ce6.tar.xz discoin-e9d0d252fc57119766f5d7b58715451dd42b1ce6.zip | |
Merge pull request #6208
d6922aa [net, trivial] remove using namespace std pollution in netbase.cpp (Philip Kaufmann)
49b2292 [net, trivial] explicitly use std::string for FindNode (Philip Kaufmann)
Diffstat (limited to 'src/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 41cc18d3c..e3cb4e706 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); |