Merge pull request #7116

laanwj · laanwj · commit 74b5ce24c6a4 · 2015-11-30T10:18:46.000+01:00
cb491e7 Trivial: Fix warning introduced by #7053 by casting to uint64_t (Jorge Timón)
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -65,7 +65,7 @@ class CChainParams
     /** Policy: Filter transactions that do not match well-defined patterns */
     bool RequireStandard() const { return fRequireStandard; }
     int64_t MaxTipAge() const { return nMaxTipAge; }
-    int64_t PruneAfterHeight() const { return nPruneAfterHeight; }
+    uint64_t PruneAfterHeight() const { return nPruneAfterHeight; }
     /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */
     bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
     /** In the future use NetworkIDString() for RPC fields */
diff --git a/src/main.cpp b/src/main.cpp
@@ -3290,7 +3290,7 @@ void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight
     if (chainActive.Tip() == NULL || nPruneTarget == 0) {
         return;
     }
-    if (chainActive.Tip()->nHeight <= nPruneAfterHeight) {
+    if ((uint64_t)chainActive.Tip()->nHeight <= nPruneAfterHeight) {
         return;
     }
 
diff --git a/src/main.h b/src/main.h
@@ -222,7 +222,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
  *
  * Pruning functions are called from FlushStateToDisk when the global fCheckForPruning flag has been set.
  * Block and undo files are deleted in lock-step (when blk00003.dat is deleted, so is rev00003.dat.)
- * Pruning cannot take place until the longest chain is at least a certain length (100000 on mainnet, 1000 on testnet, 10 on regtest).
+ * Pruning cannot take place until the longest chain is at least a certain length (100000 on mainnet, 1000 on testnet, 1000 on regtest).
  * Pruning will never delete a block within a defined distance (currently 288) from the active chain's tip.
  * The block index is updated by unsetting HAVE_DATA and HAVE_UNDO for any blocks that were stored in the deleted files.
  * A db flag records the fact that at least some block files have been pruned.

Original file line number	Diff line number	Diff line change
`@@ -3290,7 +3290,7 @@ void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight`
`3290`	`3290`	`if (chainActive.Tip() == NULL \|\| nPruneTarget == 0) {`
`3291`	`3291`	`return;`
`3292`	`3292`	`}`
`3293`		`- if (chainActive.Tip()->nHeight <= nPruneAfterHeight) {`
	`3293`	`+ if ((uint64_t)chainActive.Tip()->nHeight <= nPruneAfterHeight) {`
`3294`	`3294`	`return;`
`3295`	`3295`	`}`
`3296`	`3296`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);`
`222`	`222`	`*`
`223`	`223`	`* Pruning functions are called from FlushStateToDisk when the global fCheckForPruning flag has been set.`
`224`	`224`	`* Block and undo files are deleted in lock-step (when blk00003.dat is deleted, so is rev00003.dat.)`
`225`		`- * Pruning cannot take place until the longest chain is at least a certain length (100000 on mainnet, 1000 on testnet, 10 on regtest).`
	`225`	`+ * Pruning cannot take place until the longest chain is at least a certain length (100000 on mainnet, 1000 on testnet, 1000 on regtest).`
`226`	`226`	`* Pruning will never delete a block within a defined distance (currently 288) from the active chain's tip.`
`227`	`227`	`* The block index is updated by unsetting HAVE_DATA and HAVE_UNDO for any blocks that were stored in the deleted files.`
`228`	`228`	`* A db flag records the fact that at least some block files have been pruned.`