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)
2015-01-06 20:00:45 +01:00 · 2015-01-06 20:00:45 +01:00 · 3b95808428
commit 3b95808428
parent de70dd4904 bdb6a71d3d
2 changed files with 1 additions and 3 deletions
--- a/src/db.h
+++ b/src/db.h
@ -23,8 +23,6 @@
 class CDiskBlockIndex;
 class COutPoint;

-struct CBlockLocator;
-
 extern unsigned int nWalletDBUpdated;

 void ThreadFlushWalletDB(const std::string& strWalletFile);
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@ -162,7 +162,7 @@ struct CBlockLocator
        vHave.clear();
    }

-    bool IsNull()
+    bool IsNull() const
    {
        return vHave.empty();
    }