gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1252 from bsergean/v1.x

Browse Source 
Fix windows compile error where std::max is overriden by a macro (#1251)
This commit is contained in:
Gabi Melman
2019-09-30 08:34:02 +03:00
committed by GitHub
parent 274558c430 5381061d97
commit 1e8299e893
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/details/pattern_formatter-inl.h
View File

@@ -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);