From 14a071c4786f1714543df5249abe394da8c54fc1 Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Mon, 19 Nov 2018 02:29:36 +0100 Subject: [PATCH] Fix osx build --- include/spdlog/details/fmt_helper.h | 16 +++++----------- include/spdlog/details/pattern_formatter.h | 3 +-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h index 63c94c7b..c8db3109 100644 --- a/include/spdlog/details/fmt_helper.h +++ b/include/spdlog/details/fmt_helper.h @@ -42,7 +42,6 @@ inline void append_int(T n, fmt::basic_memory_buffer &dest) dest.append(i.data(), i.data() + i.size()); } - template inline void pad2(int n, fmt::basic_memory_buffer &dest) { @@ -60,23 +59,21 @@ inline void pad2(int n, fmt::basic_memory_buffer &dest) dest.push_back('0'); dest.push_back(static_cast('0' + n)); } - else // negatives (unlikely, but just in case, let fmt deal with it) + else // negatives (unlikely, but just in case, let fmt deal with it) { fmt::format_to(dest, "{:02}", n); } } - - template inline void pad_uint(T n, unsigned int width, fmt::basic_memory_buffer &dest) { static_assert(std::is_unsigned::value, "append_uint must get unsigned T"); - auto digits = fmt::internal::count_digits(n); - if(width > digits) + auto digits = fmt::internal::count_digits(static_cast(n)); + if (width > digits) { - const char* zeroes = "0000000000000000000"; - dest.append(zeroes, zeroes + width-digits); + const char *zeroes = "0000000000000000000"; + dest.append(zeroes, zeroes + width - digits); } append_int(n, dest); } @@ -87,7 +84,6 @@ inline void pad3(T n, fmt::basic_memory_buffer &dest) pad_uint(n, 3, dest); } - template inline void pad6(T n, fmt::basic_memory_buffer &dest) { @@ -100,8 +96,6 @@ inline void pad9(T n, fmt::basic_memory_buffer &dest) pad_uint(n, 9, dest); } - - // return fraction of a second of the given time_point. // e.g. // fraction(tp) -> will return the millis part of the second diff --git a/include/spdlog/details/pattern_formatter.h b/include/spdlog/details/pattern_formatter.h index 925b23bc..bbc07b3a 100644 --- a/include/spdlog/details/pattern_formatter.h +++ b/include/spdlog/details/pattern_formatter.h @@ -487,7 +487,6 @@ public: auto ns = fmt_helper::time_fraction(msg.time); fmt_helper::pad9(static_cast(ns.count()), dest); - } }; @@ -653,7 +652,7 @@ public: void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { - const size_t field_size = fmt::internal::count_digits(msg.thread_id); + const auto field_size = fmt::internal::count_digits(static_cast(msg.thread_id)); scoped_pad p(field_size, padinfo_, dest); fmt_helper::append_int(msg.thread_id, dest); }