Merge pull request #5520

bdb6a71 IsNull doesn't change CBlockLocator, add const hint (Pavel Janík)
1b37333 Remove no longer needed declaration of CBlockLocator (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2015-01-06 20:00:45 +01:00
commit 3b95808428
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 1 additions and 3 deletions

View file

@ -23,8 +23,6 @@
class CDiskBlockIndex;
class COutPoint;
struct CBlockLocator;
extern unsigned int nWalletDBUpdated;
void ThreadFlushWalletDB(const std::string& strWalletFile);

View file

@ -162,7 +162,7 @@ struct CBlockLocator
vHave.clear();
}
bool IsNull()
bool IsNull() const
{
return vHave.empty();
}