Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

7 years ago · 34c60e5486
parent 48597a94e8 526f21ae7f
commit 34c60e5486
1 changed files with 1 additions and 1 deletions
--- a/include/spdlog/details/pattern_formatter.h
+++ b/include/spdlog/details/pattern_formatter.h
@ -1115,7 +1115,7 @@ private:
            auto digit = static_cast<size_t>(*it - '0');
            width = width * 10 + digit;
        }
-        return details::padding_info{std::min(width, max_width), side};
+        return details::padding_info{std::min<size_t>(width, max_width), side};
    }

    void compile_pattern_(const std::string &pattern)