diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-24 15:51:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-24 16:11:23 +0200 |
| commit | b9311fb6312075744418942e143325ec1f66dd5c (patch) | |
| tree | 62d9f0be6b1be0206d01d96558351557075a6c96 /src/addrman.cpp | |
| parent | 585b5dba745a25caf1cc20fdb751ff7cb3762bf0 (diff) | |
| parent | 1d5b47a9033738743e5323409777b1415a0d0af7 (diff) | |
| download | bitcoin-b9311fb6312075744418942e143325ec1f66dd5c.tar.xz | |
Merge pull request #6028
1d5b47a nLastTry is only used for addrman entries (Pieter Wuille)
Diffstat (limited to 'src/addrman.cpp')
| -rw-r--r-- | src/addrman.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/addrman.cpp b/src/addrman.cpp index 094c913e9c..c41ee3f9fc 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -331,10 +331,10 @@ void CAddrMan::Attempt_(const CService& addr, int64_t nTime) info.nAttempts++; } -CAddress CAddrMan::Select_() +CAddrInfo CAddrMan::Select_() { if (size() == 0) - return CAddress(); + return CAddrInfo(); // Use a 50% chance for choosing between tried and new table entries. if (nTried > 0 && (nNew == 0 || GetRandInt(2) == 0)) { |