diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2021-01-08 10:16:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 11:16:18 +0100 |
| commit | 9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch) | |
| tree | 3f287d339e15c4902ee415556475fd9b2918d33c /src/sound | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/sound')
| -rw-r--r-- | src/sound/win32_s.cpp | 2 | ||||
| -rw-r--r-- | src/sound/xaudio2_s.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sound/win32_s.cpp b/src/sound/win32_s.cpp index 4551778bd..0e6ce6681 100644 --- a/src/sound/win32_s.cpp +++ b/src/sound/win32_s.cpp @@ -70,7 +70,7 @@ const char *SoundDriver_Win32::Start(const StringList &parm) /* Limit buffer size to prevent overflows. */ _bufsize = GetDriverParamInt(parm, "bufsize", (GB(GetVersion(), 0, 8) > 5) ? 8192 : 4096); - _bufsize = min(_bufsize, UINT16_MAX); + _bufsize = std::min<int>(_bufsize, UINT16_MAX); try { if (nullptr == (_event = CreateEvent(nullptr, FALSE, FALSE, nullptr))) throw "Failed to create event"; diff --git a/src/sound/xaudio2_s.cpp b/src/sound/xaudio2_s.cpp index bd47b2065..e08b917a8 100644 --- a/src/sound/xaudio2_s.cpp +++ b/src/sound/xaudio2_s.cpp @@ -193,7 +193,7 @@ const char *SoundDriver_XAudio2::Start(const StringList &parm) // Limit buffer size to prevent overflows int bufsize = GetDriverParamInt(parm, "bufsize", 8192); - bufsize = min(bufsize, UINT16_MAX); + bufsize = std::min<int>(bufsize, UINT16_MAX); _voice_context = new StreamingVoiceContext(bufsize * 4); |