diff --git a/externals/demangle/llvm/Demangle/ItaniumDemangle.h b/externals/demangle/llvm/Demangle/ItaniumDemangle.h index 0dc3d73372..a2bac5d735 100644 --- a/externals/demangle/llvm/Demangle/ItaniumDemangle.h +++ b/externals/demangle/llvm/Demangle/ItaniumDemangle.h @@ -1259,7 +1259,7 @@ class ParameterPack final : public Node { // Setup OutputBuffer for a pack expansion, unless we're already expanding // one. void initializePackExpansion(OutputBuffer &OB) const { - if (OB.CurrentPackMax == std::numeric_limits::max()) { + if (OB.CurrentPackMax == (std::numeric_limits::max)()) { OB.CurrentPackMax = static_cast(Data.size()); OB.CurrentPackIndex = 0; } @@ -1353,7 +1353,7 @@ public: const Node *getChild() const { return Child; } void printLeft(OutputBuffer &OB) const override { - constexpr unsigned Max = std::numeric_limits::max(); + constexpr unsigned Max = (std::numeric_limits::max)(); ScopedOverride SavePackIdx(OB.CurrentPackIndex, Max); ScopedOverride SavePackMax(OB.CurrentPackMax, Max); size_t StreamPos = OB.getCurrentPosition(); diff --git a/externals/demangle/llvm/Demangle/Utility.h b/externals/demangle/llvm/Demangle/Utility.h index 30dfbfc8dc..0d2e613ea9 100644 --- a/externals/demangle/llvm/Demangle/Utility.h +++ b/externals/demangle/llvm/Demangle/Utility.h @@ -88,8 +88,8 @@ public: /// If a ParameterPackExpansion (or similar type) is encountered, the offset /// into the pack that we're currently printing. - unsigned CurrentPackIndex = std::numeric_limits::max(); - unsigned CurrentPackMax = std::numeric_limits::max(); + unsigned CurrentPackIndex = (std::numeric_limits::max)(); + unsigned CurrentPackMax = (std::numeric_limits::max)(); /// When zero, we're printing template args and '>' needs to be parenthesized. /// Use a counter so we can simply increment inside parentheses. diff --git a/externals/tz/tz/tz.cpp b/externals/tz/tz/tz.cpp index 04fa6cc8a9..c18129d5ee 100644 --- a/externals/tz/tz/tz.cpp +++ b/externals/tz/tz/tz.cpp @@ -466,8 +466,8 @@ CalendarTimeInternal* timesub(const time_t* timep, s64 offset, const Rule* sp, int signed_y = static_cast(y); tmp->tm_year = signed_y - TM_YEAR_BASE; } - else if ((!std::is_signed_v || std::numeric_limits::min() + TM_YEAR_BASE <= y) && - y - TM_YEAR_BASE <= std::numeric_limits::max()) { + else if ((!std::is_signed_v || (std::numeric_limits::min)() + TM_YEAR_BASE <= y) && + y - TM_YEAR_BASE <= (std::numeric_limits::max)()) { tmp->tm_year = static_cast(y - TM_YEAR_BASE); } else { @@ -558,8 +558,8 @@ CalendarTimeInternal* localsub(Rule const* sp, time_t const* timep, s64 setname, else { newy += years; } - if (!(std::numeric_limits::min() <= newy && - newy <= std::numeric_limits::max())) { + if (!((std::numeric_limits::min)() <= newy && + newy <= (std::numeric_limits::max)())) { return nullptr; } result->tm_year = static_cast(newy); diff --git a/externals/tz/tz/tz.h b/externals/tz/tz/tz.h index dae4459bcb..fb860ce989 100644 --- a/externals/tz/tz/tz.h +++ b/externals/tz/tz/tz.h @@ -26,10 +26,10 @@ constexpr size_t TZ_MAX_CHARS = 50; constexpr size_t MY_TZNAME_MAX = 255; constexpr size_t TZNAME_MAXIMUM = 255; constexpr size_t TZ_MAX_LEAPS = 50; -constexpr s64 TIME_T_MAX = std::numeric_limits::max(); -constexpr s64 TIME_T_MIN = std::numeric_limits::min(); +constexpr s64 TIME_T_MAX = (std::numeric_limits::max)(); +constexpr s64 TIME_T_MIN = (std::numeric_limits::min)(); constexpr size_t CHARS_EXTRA = 3; -constexpr size_t MAX_ZONE_CHARS = std::max(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC")); +constexpr size_t MAX_ZONE_CHARS = (std::max)(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC")); constexpr size_t MAX_TZNAME_CHARS = 2 * (MY_TZNAME_MAX + 1); struct ttinfo { @@ -51,7 +51,7 @@ struct Rule { std::array ats; std::array types; std::array ttis; - std::array chars; + std::array chars; s32 defaulttype; std::array padding1; }; diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index eaa6912f0d..60e0e8449b 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -811,7 +811,7 @@ void BufferCache

::BindHostVertexBuffers() { auto& flags = maxwell3d->dirty.flags; u32 enabled_mask = enabled_vertex_buffers_mask; HostBindings bindings{}; - u32 last_index = std::numeric_limits::max(); + u32 last_index = (std::numeric_limits::max)(); const auto flush_bindings = [&]() { if (bindings.buffers.empty()) { return; @@ -819,7 +819,7 @@ void BufferCache

::BindHostVertexBuffers() { bindings.max_index = bindings.min_index + static_cast(bindings.buffers.size()); runtime.BindVertexBuffers(bindings); bindings = HostBindings{}; - last_index = std::numeric_limits::max(); + last_index = (std::numeric_limits::max)(); }; while (enabled_mask != 0) { const u32 index = std::countr_zero(enabled_mask);