Fix various warnings #6133
Merged
Fix various warnings #6133
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -136,7 +136,7 @@ extern bool fPruneMode; | |||
| /** Number of MiB of block files that we're trying to stay below. */ | |||
| extern uint64_t nPruneTarget; | |||
| /** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of chainActive.Tip() will not be pruned. */ | |||
| static const signed int MIN_BLOCKS_TO_KEEP = 288; | |||
| static const unsigned MIN_BLOCKS_TO_KEEP = 288; | |||
There was a problem hiding this comment.
Feels strange to not see the type in here, no?
There was a problem hiding this comment.
We never use unsigned without type in the code anywhere else, let's just make this unsigned int.
There was a problem hiding this comment.
I see 5 other cases in the code, but fine with me.
| @@ -496,7 +496,7 @@ void CTxMemPool::removeCoinbaseSpends(const CCoinsViewCache *pcoins, unsigned in | |||
| continue; | |||
| const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash); | |||
| if (fSanityCheck) assert(coins); | |||
| if (!coins || (coins->IsCoinBase() && nMemPoolHeight - coins->nHeight < COINBASE_MATURITY)) { | |||
| if (!coins || (coins->IsCoinBase() && ((signed long)nMemPoolHeight) - coins->nHeight < COINBASE_MATURITY)) { | |||
There was a problem hiding this comment.
coins->nHeight is an int, nMempoolHeight is an unsigned int. Any specific reason for introducing a signed long here?
There was a problem hiding this comment.
COINBASE_MATURITY is a [signed] int, and we are subtracting.
1ced98a to
130fd3e
Compare
|
Untested ACK, needs rebase. |
Found while building on Debian 7
130fd3e to
e617fe2
Compare
|
Rebased |
laanwj
added a commit
that referenced
this pull request
Jul 2, 2015
e617fe2 Fix various warnings (Luke Dashjr)
luke-jr
added a commit
to luke-jr/bitcoin
that referenced
this pull request
Jan 10, 2016
Found while building on Debian 7 Github-Pull: bitcoin#6133 Rebased-From: e617fe2
luke-jr
added a commit
to luke-jr/bitcoin
that referenced
this pull request
Jan 10, 2016
Found while building on Debian 7 Github-Pull: bitcoin#6133 Rebased-From: e617fe2
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Mar 3, 2017
Bitcoin 0.12 misc PRs 1 Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6198 - bitcoin/bitcoin#6206 - bitcoin/bitcoin#5927 - bitcoin/bitcoin#6213 - bitcoin/bitcoin#6061 - bitcoin/bitcoin#6283 (partial, remainder was pulled in #929) - bitcoin/bitcoin#6272 - bitcoin/bitcoin#6316 - bitcoin/bitcoin#6133 - bitcoin/bitcoin#6387 - bitcoin/bitcoin#6401 - bitcoin/bitcoin#6434 - bitcoin/bitcoin#6372 - bitcoin/bitcoin#6447 - bitcoin/bitcoin#6149 - bitcoin/bitcoin#6468 Part of #2074.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Found while building on Debian 7
NOTE: There is one remaining warning I was not able to figure out: