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.h | |
| 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.h')
| -rw-r--r-- | src/netbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netbase.h b/src/netbase.h index 0f6fc9b499..a66d3e7f61 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -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; |