From fbd36d8fb5245a5511b2db7a35270fb1250e21d5 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 29 Sep 2014 13:13:47 +0200
Subject: Avoid introducing a virtual into CChainParams

Treat fSkipProofOfWorkCheck the same as other parameters.
---
 src/chainparams.cpp | 5 +----
 src/chainparams.h   | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 8a00da0bb5..31c67715c8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -115,6 +115,7 @@ public:
         fAllowMinDifficultyBlocks = false;
         fRequireStandard = true;
         fMineBlocksOnDemand = false;
+        fSkipProofOfWorkCheck = false;
     }
 };
 static CMainParams mainParams;
@@ -231,11 +232,7 @@ public:
         fDefaultCheckMemPool = true;
         fAllowMinDifficultyBlocks = false;
         fMineBlocksOnDemand = true;
-        fSkipProofOfWorkCheck = false;
     }
-    virtual bool SkipProofOfWorkCheck() const { return fSkipProofOfWorkCheck; }
-protected:
-    bool fSkipProofOfWorkCheck;
 public:
     // Published setters to allow changing values in unit test cases
     virtual void setSubsidyHalvingInterval(int anSubsidyHalvingInterval)  { nSubsidyHalvingInterval=anSubsidyHalvingInterval; }
diff --git a/src/chainparams.h b/src/chainparams.h
index 171a590a5f..50441a89f3 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -62,7 +62,7 @@ public:
     /* Allow mining of a min-difficulty block */
     bool AllowMinDifficultyBlocks() const { return fAllowMinDifficultyBlocks; }
     /* Skip proof-of-work check: allow mining of any difficulty block */
-    virtual bool SkipProofOfWorkCheck() const { return false; }
+    bool SkipProofOfWorkCheck() const { return fSkipProofOfWorkCheck; }
     /* Make standard checks */
     bool RequireStandard() const { return fRequireStandard; }
     int64_t TargetTimespan() const { return nTargetTimespan; }
@@ -105,6 +105,7 @@ protected:
     bool fAllowMinDifficultyBlocks;
     bool fRequireStandard;
     bool fMineBlocksOnDemand;
+    bool fSkipProofOfWorkCheck;
 };
 
 /** Modifiable parameters interface is used by test cases to adapt the parameters in order
-- 
cgit v1.2.3