zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- silenced some warnings.

Browse source
This commit is contained in:
Christoph Oelckers 2022-05-14 11:55:56 +02:00
parent 2be13e1b9f
commit c23abd1930
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/filesystem/file_zip.cpp
View file

@ -222,7 +222,7 @@ bool FZipFile::Open(bool quiet, LumpFilterInfo* filter)
return false; return false;
} }
NumLumps = info.NumEntries; NumLumps = (uint32_t)info.NumEntries;
dirsize = info.DirectorySize; dirsize = info.DirectorySize;
DirectoryOffset = info.DirectoryOffset; DirectoryOffset = info.DirectoryOffset;
} }
@ -521,7 +521,7 @@ int FZipLump::GetFileOffset()
{ {
if (Method != METHOD_STORED) return -1; if (Method != METHOD_STORED) return -1;
if (NeedFileStart) SetLumpAddress(); if (NeedFileStart) SetLumpAddress();
return Position; return (int)Position;
} }
//========================================================================== //==========================================================================

4
src/common/objects/dobjgc.cpp
View file

@ -277,7 +277,7 @@ void MarkArray(DObject **obj, size_t count)
static size_t CalcStepSize() static size_t CalcStepSize()
{ {
int time_passed = CheckTime - LastCollectTime; int time_passed = int(CheckTime - LastCollectTime);
auto alloc = min(LastCollectAlloc, Estimate); auto alloc = min(LastCollectAlloc, Estimate);
size_t bytes_gained = AllocBytes > alloc ? AllocBytes - alloc : 0; size_t bytes_gained = AllocBytes > alloc ? AllocBytes - alloc : 0;
return (StepMul > 0 && time_passed > 0) return (StepMul > 0 && time_passed > 0)
@ -390,7 +390,7 @@ static size_t SingleStep()
case GCS_Finalize: case GCS_Finalize:
State = GCS_Pause; // end collection State = GCS_Pause; // end collection
LastCollectAlloc = AllocBytes; LastCollectAlloc = AllocBytes;
LastCollectTime = CheckTime; LastCollectTime = (int)CheckTime;
return 0; return 0;
default: default: