highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +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

2
src/netbase.h
View File

@@ -66,7 +66,7 @@ class CNetAddr
std::string ToString() const;
std::string ToStringIP() const;
int GetByte(int n) const;
int64 GetHash() const;
uint64 GetHash() const;
bool GetInAddr(struct in_addr* pipv4Addr) const;
std::vector<unsigned char> GetGroup() const;
int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const;