Skip to content

Commit f48ad6a

Browse files
committed
Dont format logging calls with only the format string
1 parent c209fee commit f48ad6a

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/Cemu/Logging/CemuLogging.h

+13-6
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,28 @@ auto ForwardEnum(std::tuple<TArgs...> t)
7676
}
7777

7878
template<typename T, typename ... TArgs>
79-
bool cemuLog_log(LogType type, std::basic_string<T> format, TArgs&&... args)
79+
bool cemuLog_log(LogType type, std::basic_string<T> formatStr, TArgs&&... args)
8080
{
8181
if (!cemuLog_isLoggingEnabled(type))
8282
return false;
83-
84-
const auto format_view = fmt::basic_string_view<T>(format);
85-
const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffer_context<T>>(ForwardEnum(args)...));
86-
cemuLog_log(type, std::basic_string_view(text.data(), text.size()));
83+
if constexpr (sizeof...(TArgs) == 0)
84+
{
85+
cemuLog_log(type, std::basic_string_view<T>(formatStr.data(), formatStr.size()));
86+
return true;
87+
}
88+
else
89+
{
90+
const auto format_view = fmt::basic_string_view<T>(formatStr);
91+
const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffer_context<T>>(ForwardEnum(args)...));
92+
cemuLog_log(type, std::basic_string_view(text.data(), text.size()));
93+
}
8794
return true;
8895
}
8996

9097
template<typename T, typename ... TArgs>
9198
bool cemuLog_log(LogType type, const T* format, TArgs&&... args)
9299
{
93-
auto format_str=std::basic_string<T>(format);
100+
auto format_str = std::basic_string<T>(format);
94101
return cemuLog_log(type, format_str, std::forward<TArgs>(args)...);
95102
}
96103

0 commit comments

Comments
 (0)