diff options
| author | Gavin Andresen <[email protected]> | 2012-06-18 10:48:40 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-06-18 10:48:40 -0400 |
| commit | 550c73f4c87825e8524f7f164e0bc3e80c6822b9 (patch) | |
| tree | a674350fd0b5b4dd017ce5c553a268d960cbf287 /src/main.cpp | |
| parent | Merge pull request #1480 from fanquake/master (diff) | |
| parent | Move NOINLINE definition to test where it's used. (diff) | |
| download | discoin-550c73f4c87825e8524f7f164e0bc3e80c6822b9.tar.xz discoin-550c73f4c87825e8524f7f164e0bc3e80c6822b9.zip | |
Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
Resolved minor conflict in main.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index be2733192..0654ff889 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2475,7 +2475,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) static uint256 hashSalt; if (hashSalt == 0) hashSalt = GetRandHash(); - 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; |