Unverified Commit 5b4c4f3f authored by Gabi Melman's avatar Gabi Melman Committed by GitHub

Merge pull request #2011 from sjanel/bugfix/fixclangcompilation

Fix compilation error in clang 13 in C++20 mode - ambiguous call to log function
parents 816ede3a aecdfc60
...@@ -102,13 +102,13 @@ public: ...@@ -102,13 +102,13 @@ public:
log(loc, lvl, string_view_t{msg}); log(loc, lvl, string_view_t{msg});
} }
// T cannot be statically converted to niether string_view, neither wstring_view and niether to format string // T cannot be statically converted to neither string_view, nor wstring_view and nor format string
template<class T, typename std::enable_if<!std::is_convertible<const T &, spdlog::string_view_t>::value template<class T, typename std::enable_if<!std::is_convertible<const T &, spdlog::string_view_t>::value &&
&& !is_convertible_to_basic_format_string<const T&>::value, !is_convertible_to_basic_format_string<const T &>::value,
int>::type = 0> int>::type = 0>
void log(source_loc loc, level::level_enum lvl, const T &msg) void log(source_loc loc, level::level_enum lvl, const T &msg)
{ {
log(loc, lvl, "{}", msg); log(loc, lvl, "{}", msg);
} }
void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg)
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
{ {
log(source_loc{}, lvl, msg); log(source_loc{}, lvl, msg);
} }
template<typename... Args> template<typename... Args>
void trace(fmt::format_string<Args...> fmt, Args &&...args) void trace(fmt::format_string<Args...> fmt, Args &&...args)
{ {
......
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