Skip to content

Commit 5682c9d

Browse files
committed
Some fmt fixes
1 parent 5753afb commit 5682c9d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

include/sisl/logging/logging.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ constexpr const char* file_name(const char* const str) { return str_slant(str) ?
134134
fmt::memory_buffer _log_buf{}; \
135135
const auto& cb{formatter}; \
136136
[[likely]] if (cb(_log_buf, msg __VA_OPT__(, ) __VA_ARGS__)) { \
137-
fmt::vformat_to(fmt::appender{_log_buf}, fmt::string_view{"{}"}, fmt::make_format_args('\0')); \
137+
fmt::format_to(fmt::appender{_log_buf}, fmt::string_view{"\0"}); \
138138
_l->method(_log_buf.data()); \
139139
if (is_flush) { _l->flush(); } \
140140
} \
@@ -145,7 +145,7 @@ constexpr const char* file_name(const char* const str) { return str_slant(str) ?
145145
fmt::memory_buffer _log_buf{}; \
146146
const auto& cb{formatter}; \
147147
if (LOGGING_PREDICT_TRUE(cb(_log_buf, msg __VA_OPT__(, ) __VA_ARGS__))) { \
148-
fmt::vformat_to(fmt::appender{_log_buf}, fmt::string_view{"{}"}, fmt::make_format_args('\0')); \
148+
fmt::format_to(fmt::appender{_log_buf}, fmt::string_view{"\0"}); \
149149
_l->method(_log_buf.data()); \
150150
if (is_flush) { _l->flush(); } \
151151
} \
@@ -495,9 +495,11 @@ template < typename T1, typename T2, typename T3, typename... Args >
495495
void _cmp_assert_with_msg(fmt::memory_buffer& buf, const char* const msg, T1&& val1, T2&& op, T3&& val2,
496496
Args&&... args) {
497497

498+
auto val_1_cp = val1;
499+
auto val_2_cp = val2;
498500
fmt::vformat_to(fmt::appender{buf},
499501
fmt::string_view{"******************** Assertion failure: =====> Expected '{}' to be {} to '{}' "},
500-
fmt::make_format_args(std::forward< T1 >(val1), std::forward< T2 >(op), std::forward< T3 >(val2)));
502+
fmt::make_format_args(val_1_cp, std::forward< T2 >(op), val_2_cp));
501503
fmt::vformat_to(fmt::appender{buf}, fmt::string_view{msg}, fmt::make_format_args(std::forward< Args >(args)...));
502504
}
503505

src/logging/logging.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static std::string setup_modules() {
295295
const std::string& mod_name{glob_enabled_mods[mod_num]};
296296
fmt::vformat_to(
297297
std::back_inserter(out_str), fmt::string_view{"{}={}, "},
298-
fmt::make_format_args(mod_name, spdlog::level::to_string_view(GetModuleLogLevel(mod_name)).data()));
298+
fmt::make_format_args(mod_name, spdlog::level::to_string_view(GetModuleLogLevel(mod_name))));
299299
}
300300

301301
return out_str;

0 commit comments

Comments
 (0)