From 0f4def2338d0ea106fc9d8abddde786a1a1ab4e5 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Sun, 29 Sep 2019 22:00:57 -0700 Subject: [PATCH] fix windows compile error in include/spdlog/details/pattern_formatter-inl.h --- .../spdlog/include/spdlog/details/pattern_formatter-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/spdlog/include/spdlog/details/pattern_formatter-inl.h b/third_party/spdlog/include/spdlog/details/pattern_formatter-inl.h index 06a3dcd1..1b95eb6d 100644 --- a/third_party/spdlog/include/spdlog/details/pattern_formatter-inl.h +++ b/third_party/spdlog/include/spdlog/details/pattern_formatter-inl.h @@ -878,7 +878,7 @@ public: void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override { - auto delta = std::max(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); auto delta_units = std::chrono::duration_cast(delta); last_message_time_ = msg.time; ScopedPadder p(6, padinfo_, dest);