R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler errors

Browse Source 
Conflicted with the 'min' and 'max' macro's, putting them in parentheses fixes it.
This commit is contained in:
Kawe Mazidjatari 2023-07-29 16:27:01 +02:00
parent d31fa3b8c7
commit 931ee11bf3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/thirdparty/zip/src/compression/compression_interface.h vendored
View File

@ -13,7 +13,7 @@ struct compression_encoder_properties_interface
template <typename T> template <typename T>
inline T clamp(T minimum, T maximum, T value) inline T clamp(T minimum, T maximum, T value)
{ {
return std::min(std::max(minimum, value), maximum); return (std::min)((std::max)(minimum, value), maximum);
} }
}; };

2
r5dev/thirdparty/zip/src/streams/streambuffs/sub_streambuf.h vendored
View File

@ -66,7 +66,7 @@ class sub_streambuf :
ELEM_TYPE* base = _internalBuffer; ELEM_TYPE* base = _internalBuffer;
_inputStream->seekg(_currentPosition, std::ios::beg); _inputStream->seekg(_currentPosition, std::ios::beg);
_inputStream->read(_internalBuffer, std::min(static_cast<size_t>(INTERNAL_BUFFER_SIZE), static_cast<size_t>(_endPosition - _currentPosition))); _inputStream->read(_internalBuffer, (std::min)(static_cast<size_t>(INTERNAL_BUFFER_SIZE), static_cast<size_t>(_endPosition - _currentPosition)));
size_t n = static_cast<size_t>(_inputStream->gcount()); size_t n = static_cast<size_t>(_inputStream->gcount());
_currentPosition += n; _currentPosition += n;