Unverified Commit 1e8299e8 authored by Gabi Melman's avatar Gabi Melman Committed by GitHub

Merge pull request #1252 from bsergean/v1.x

Fix windows compile error where std::max is overriden by a macro (#1251)
parents 274558c4 5381061d
...@@ -878,7 +878,7 @@ public: ...@@ -878,7 +878,7 @@ public:
void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override 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<DurationUnits>(delta); auto delta_units = std::chrono::duration_cast<DurationUnits>(delta);
last_message_time_ = msg.time; last_message_time_ = msg.time;
ScopedPadder p(6, padinfo_, dest); ScopedPadder p(6, padinfo_, dest);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment