Declare headers height/time cache mutable, re-set the methods const

bitcoinknots · Apr 20, 2017 · 610a917 · 610a917
1 parent cf92bce
commit 610a917
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -74,7 +74,7 @@ int ClientModel::getNumBlocks() const
     return chainActive.Height();
 }
 
-int ClientModel::getHeaderTipHeight()
+int ClientModel::getHeaderTipHeight() const
 {
     if (cachedBestHeaderHeight == -1) {
         // make sure we initially populate the cache via a cs_main lock
@@ -87,7 +87,7 @@ int ClientModel::getHeaderTipHeight()
     return cachedBestHeaderHeight;
 }
 
-int64_t ClientModel::getHeaderTipTime()
+int64_t ClientModel::getHeaderTipTime() const
 {
     if (cachedBestHeaderTime == -1) {
         LOCK(cs_main);

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -51,8 +51,8 @@ class ClientModel : public QObject
     //! Return number of connections, default is in- and outbound (total)
     int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
     int getNumBlocks() const;
-    int getHeaderTipHeight();
-    int64_t getHeaderTipTime();
+    int getHeaderTipHeight() const;
+    int64_t getHeaderTipTime() const;
     //! Return number of transactions in the mempool
     long getMempoolSize() const;
     //! Return the dynamic memory usage of the mempool
@@ -82,8 +82,8 @@ class ClientModel : public QObject
     QString dataDir() const;
 
     // caches for the best header
-    std::atomic<int> cachedBestHeaderHeight;
-    std::atomic<int64_t> cachedBestHeaderTime;
+    mutable std::atomic<int> cachedBestHeaderHeight;
+    mutable std::atomic<int64_t> cachedBestHeaderTime;
 
 private:
     OptionsModel *optionsModel;