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)

2 files changed, 1 insertions, 3 deletions

diff --git a/src/db.h b/src/db.h
index 717462ff4f..393978633f 100644
--- 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);
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 53fcd104ad..d77ab162e0 100644
--- 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();
     }