tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly cast ustring to string when passing to fmt

Browse Source 
don't rely on implicit conversion which is no longer present in fmt
10.1.0

Fixes #2403
This commit is contained in:
Jan Palus 2023-08-15 20:57:07 +02:00
parent e90c66a102
commit c8237437d2
No known key found for this signature in database
GPG Key ID: AF176E5122D88062
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util/format.hpp
View File

@ -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

2
src/modules/sni/item.cpp
View File

@ -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);
} }