Explicitly cast ustring to string when passing to fmt
don't rely on implicit conversion which is no longer present in fmt 10.1.0 Fixes #2403pull/2409/head
parent
e90c66a102
commit
c8237437d2
|
@ -93,7 +93,7 @@ template <>
|
||||||
struct formatter<Glib::ustring> : formatter<std::string> {
|
struct formatter<Glib::ustring> : formatter<std::string> {
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const Glib::ustring& value, FormatContext& ctx) {
|
auto format(const Glib::ustring& value, FormatContext& ctx) {
|
||||||
return formatter<std::string>::format(value, ctx);
|
return formatter<std::string>::format(static_cast<std::string>(value), ctx);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
} // namespace fmt
|
} // namespace fmt
|
||||||
|
|
|
@ -22,7 +22,7 @@ struct fmt::formatter<Glib::VariantBase> : formatter<std::string> {
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const Glib::VariantBase& value, FormatContext& ctx) {
|
auto format(const Glib::VariantBase& value, FormatContext& ctx) {
|
||||||
if (is_printable(value)) {
|
if (is_printable(value)) {
|
||||||
return formatter<std::string>::format(value.print(), ctx);
|
return formatter<std::string>::format(static_cast<std::string>(value.print()), ctx);
|
||||||
} else {
|
} else {
|
||||||
return formatter<std::string>::format(value.get_type_string(), ctx);
|
return formatter<std::string>::format(value.get_type_string(), ctx);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue