aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2012-05-13 21:31:59 +0200
committerRicardo M. Correia <rcorreia@wizy.org>2012-05-13 21:42:54 +0200
commit4843b55fd167c54d86eb9e1f19525ed363cfe72d (patch)
tree81a74462fdd3fc20a25521a8634121ad0b1a445f /src/main.cpp
parent1653f97c8f3c37cd96e03cf397c31c5caf81af08 (diff)
downloadbitcoin-4843b55fd167c54d86eb9e1f19525ed363cfe72d.tar.xz
Make CNetAddr::GetHash() return an unsigned val.
This prevents an undefined operation in main.cpp, when shifting the hash value left by 32 bits. Shifting a signed int left into the sign bit is undefined in C++11.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 20bb56e964..f71702f0e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2440,7 +2440,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
static uint256 hashSalt;
if (hashSalt == 0)
RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt));
- int64 hashAddr = addr.GetHash();
+ uint64 hashAddr = addr.GetHash();
uint256 hashRand = hashSalt ^ (hashAddr<<32) ^ ((GetTime()+hashAddr)/(24*60*60));
hashRand = Hash(BEGIN(hashRand), END(hashRand));
multimap<uint256, CNode*> mapMix;