aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJorge Timón <jtimon@jtimon.cc>2015-11-27 15:12:08 +0100
committerJorge Timón <jtimon@jtimon.cc>2015-11-29 21:19:37 +0100
commitcb491e778828d322800793cb229884c904f172b5 (patch)
tree9239b8a15ad845955f955a09e7370cfd1f17f8e9 /src
parent2a94cd67e80555aec3ba13d5129b1f5402b0c5b4 (diff)
downloadbitcoin-cb491e778828d322800793cb229884c904f172b5.tar.xz
Trivial: Fix warning introduced by #7053 by casting to uint64_t
Diffstat (limited to 'src')
-rw-r--r--src/chainparams.h2
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/chainparams.h b/src/chainparams.h
index cb061d596e..8aa0c71d61 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -65,7 +65,7 @@ public:
/** 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
index ceb5cb66f3..eccc4999c1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3248,7 +3248,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
index f738e3eb57..7eba1f45b8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -208,7 +208,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.