mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 10:38:42 +01:00
Use std::numeric_limits<UNSIGNED>::max()) instead of (UNSIGNED)-1
This commit is contained in:
parent
6b82fc59eb
commit
cf4b0327ed
@ -8,6 +8,7 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include <cstring>
|
||||
#include <limits>
|
||||
#include <stdexcept>
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
@ -189,7 +190,7 @@ public:
|
||||
{
|
||||
// prefix operator
|
||||
int i = 0;
|
||||
while (i < WIDTH && --pn[i] == (uint32_t)-1)
|
||||
while (i < WIDTH && --pn[i] == std::numeric_limits<uint32_t>::max())
|
||||
i++;
|
||||
return *this;
|
||||
}
|
||||
|
@ -761,7 +761,7 @@ protected:
|
||||
|
||||
public:
|
||||
CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) :
|
||||
nType(nTypeIn), nVersion(nVersionIn), nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0)
|
||||
nType(nTypeIn), nVersion(nVersionIn), nSrcPos(0), nReadPos(0), nReadLimit(std::numeric_limits<uint64_t>::max()), nRewind(nRewindIn), vchBuf(nBufSize, 0)
|
||||
{
|
||||
src = fileIn;
|
||||
}
|
||||
@ -846,7 +846,7 @@ public:
|
||||
|
||||
// prevent reading beyond a certain position
|
||||
// no argument removes the limit
|
||||
bool SetLimit(uint64_t nPos = (uint64_t)(-1)) {
|
||||
bool SetLimit(uint64_t nPos = std::numeric_limits<uint64_t>::max()) {
|
||||
if (nPos < nReadPos)
|
||||
return false;
|
||||
nReadLimit = nPos;
|
||||
|
@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE(varints)
|
||||
}
|
||||
|
||||
for (uint64_t i = 0; i < 100000000000ULL; i += 999999937) {
|
||||
uint64_t j = -1;
|
||||
uint64_t j = std::numeric_limits<uint64_t>::max();
|
||||
ss >> VARINT(j);
|
||||
BOOST_CHECK_MESSAGE(i == j, "decoded:" << j << " expected:" << i);
|
||||
}
|
||||
|
@ -105,7 +105,7 @@ void static RandomTransaction(CMutableTransaction &tx, bool fSingle) {
|
||||
txin.prevout.hash = InsecureRand256();
|
||||
txin.prevout.n = InsecureRandBits(2);
|
||||
RandomScript(txin.scriptSig);
|
||||
txin.nSequence = (InsecureRandBool()) ? InsecureRand32() : (unsigned int)-1;
|
||||
txin.nSequence = (InsecureRandBool()) ? InsecureRand32() : std::numeric_limits<uint32_t>::max();
|
||||
}
|
||||
for (int out = 0; out < outs; out++) {
|
||||
tx.vout.push_back(CTxOut());
|
||||
|
Loading…
Reference in New Issue
Block a user