highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'signbugs' of https://github.com/wizeman/bitcoin

Browse Source 
Resolved minor conflict in main.cpp
This commit is contained in:
Gavin Andresen
2012-06-18 10:48:40 -04:00
parent 5204ca87e2 31ac53fbdc
commit 550c73f4c8
6 changed files with 148 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/netbase.cpp
View File

@@ -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;
}