Merge pull request #4999

775b7b8 LLu is standard, but not portable. use ULL (sinetek)
This commit is contained in:
Wladimir J. van der Laan 2014-09-29 09:35:28 +02:00
commit 76182e7cb6
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -245,7 +245,7 @@ uint64_t ReadCompactSize(Stream& is)
uint64_t xSize; uint64_t xSize;
READDATA(is, xSize); READDATA(is, xSize);
nSizeRet = xSize; nSizeRet = xSize;
if (nSizeRet < 0x100000000LLu) if (nSizeRet < 0x100000000ULL)
throw std::ios_base::failure("non-canonical ReadCompactSize()"); throw std::ios_base::failure("non-canonical ReadCompactSize()");
} }
if (nSizeRet > (uint64_t)MAX_SIZE) if (nSizeRet > (uint64_t)MAX_SIZE)