diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-18 10:48:40 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-18 10:48:40 -0400 |
| commit | 550c73f4c87825e8524f7f164e0bc3e80c6822b9 (patch) | |
| tree | a674350fd0b5b4dd017ce5c553a268d960cbf287 /src/netbase.cpp | |
| parent | 5204ca87e23fb94f31e733c63efcb46980ad42ad (diff) | |
| parent | 31ac53fbdc2346876da201b9e1495565b38b46ba (diff) | |
Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
Resolved minor conflict in main.cpp
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index d1ead79ebb..2b918b2ff3 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -867,10 +867,10 @@ std::vector<unsigned char> CNetAddr::GetGroup() const return vchRet; } -int64 CNetAddr::GetHash() const +uint64 CNetAddr::GetHash() const { uint256 hash = Hash(&ip[0], &ip[16]); - int64 nRet; + uint64 nRet; memcpy(&nRet, &hash, sizeof(nRet)); return nRet; } |