From 9b800a96ed32720ff60b74e498a0e0a6351004f9 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Fri, 8 Jan 2021 10:16:18 +0000 Subject: Codechange: Remove min/max functions in favour of STL variants (#8502) --- src/os/windows/crashlog_win.cpp | 2 +- src/os/windows/string_uniscribe.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/os/windows') diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp index c96c4cf7c..872e472d5 100644 --- a/src/os/windows/crashlog_win.cpp +++ b/src/os/windows/crashlog_win.cpp @@ -219,7 +219,7 @@ static char *PrintModuleInfo(char *output, const char *last, HMODULE mod) res = EnumProcessModules(proc, modules, sizeof(modules), &needed); CloseHandle(proc); if (res) { - size_t count = min(needed / sizeof(HMODULE), lengthof(modules)); + size_t count = std::min(needed / sizeof(HMODULE), lengthof(modules)); for (size_t i = 0; i != count; i++) output = PrintModuleInfo(output, last, modules[i]); return output + seprintf(output, last, "\n"); diff --git a/src/os/windows/string_uniscribe.cpp b/src/os/windows/string_uniscribe.cpp index 42a003ae1..ad3754866 100644 --- a/src/os/windows/string_uniscribe.cpp +++ b/src/os/windows/string_uniscribe.cpp @@ -302,7 +302,7 @@ static std::vector UniscribeItemizeString(UniscribeParagraphLayoutF for (auto const &i : fontMapping) { while (cur_pos < i.first && cur_item != items.end() - 1) { /* Add a range that spans the intersection of the remaining item and font run. */ - int stop_pos = min(i.first, (cur_item + 1)->iCharPos); + int stop_pos = std::min(i.first, (cur_item + 1)->iCharPos); assert(stop_pos - cur_pos > 0); ranges.push_back(UniscribeRun(cur_pos, stop_pos - cur_pos, i.second, cur_item->a)); @@ -452,7 +452,7 @@ int UniscribeParagraphLayout::UniscribeLine::GetLeading() const { int leading = 0; for (const auto &run : *this) { - leading = max(leading, run.GetLeading()); + leading = std::max(leading, run.GetLeading()); } return leading; -- cgit v1.2.3-54-g00ecf