Merge pull request #4823

1e73504 Fixing C4146 warning (ENikS)
This commit is contained in:
Wladimir J. van der Laan 2014-09-25 15:25:30 +02:00
commit f66f986a25
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 2 additions and 2 deletions

View File

@ -304,7 +304,7 @@ private:
// If the input vector's most significant byte is 0x80, remove it from
// the result's msb and return a negative.
if (vch.back() & 0x80)
return -(result & ~(0x80ULL << (8 * (vch.size() - 1))));
return -((int64_t)(result & ~(0x80ULL << (8 * (vch.size() - 1)))));
return result;
}

View File

@ -618,7 +618,7 @@ void ShrinkDebugFile()
{
// Restart the file with some of the end
std::vector <char> vch(200000,0);
fseek(file, -vch.size(), SEEK_END);
fseek(file, -((long)vch.size()), SEEK_END);
int nBytes = fread(begin_ptr(vch), 1, vch.size(), file);
fclose(file);