games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fixed lots of warnings.

Browse Source 
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
This commit is contained in:
John Bolton
2020-10-01 01:38:06 -07:00
parent ff471af3de
commit a05ae78e67
142 changed files with 854 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/filesystem/CCompressedStream.cpp
View File

@@ -60,7 +60,7 @@ si64 CBufferedStream::getSize()
void CBufferedStream::ensureSize(si64 size)
{
while (buffer.size() < size && !endOfFileReached)
while ((si64)buffer.size() < size && !endOfFileReached)
{
si64 initialSize = buffer.size();
si64 currentStep = std::min<si64>(size, buffer.size());
@@ -125,7 +125,7 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
int decompressed = inflateState->total_out;
inflateState->avail_out = size;
inflateState->avail_out = (uInt)size;
inflateState->next_out = data;
do
@@ -138,7 +138,7 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
if (availSize != compressedBuffer.size())
gzipStream.reset();
inflateState->avail_in = availSize;
inflateState->avail_in = (uInt)availSize;
inflateState->next_in = compressedBuffer.data();
}