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/net.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/net.cpp')
| -rw-r--r-- | src/net.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index 6849d7926..3908be682 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1363,7 +1363,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu FindNode((CNetAddr)addrConnect) || CNode::IsBanned(addrConnect) || FindNode(addrConnect.ToStringIPPort())) return false; - } else if (FindNode(pszDest)) + } else if (FindNode(std::string(pszDest))) return false; CNode* pnode = ConnectNode(addrConnect, pszDest); @@ -1385,7 +1385,7 @@ void ThreadMessageHandler() { boost::mutex condition_mutex; boost::unique_lock<boost::mutex> lock(condition_mutex); - + SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL); while (true) { |