blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3429 from ziyao233/outgoing/fix-fmt11

This commit is contained in:
Alexis Rouillard 2024-07-09 21:08:16 +02:00 committed by GitHub
parent b26ab1f982 7725f6ed5a
commit 44f39ca0ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util/date.hpp
View File

@ -64,7 +64,7 @@ struct fmt::formatter<date::zoned_time<Duration, TimeZonePtr>> {
} }
template <typename FormatContext> template <typename FormatContext>
auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) { auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) const {
if (ctx.locale()) { if (ctx.locale()) {
const auto loc = ctx.locale().template get<std::locale>(); const auto loc = ctx.locale().template get<std::locale>();
return fmt::format_to(ctx.out(), "{}", date::format(loc, fmt::to_string(specs), ztime)); return fmt::format_to(ctx.out(), "{}", date::format(loc, fmt::to_string(specs), ztime));

2
include/util/format.hpp
View File

@ -45,7 +45,7 @@ struct formatter<pow_format> {
} }
template <class FormatContext> template <class FormatContext>
auto format(const pow_format& s, FormatContext& ctx) -> decltype(ctx.out()) { auto format(const pow_format& s, FormatContext& ctx) const -> decltype(ctx.out()) {
const char* units[] = {"", "k", "M", "G", "T", "P", nullptr}; const char* units[] = {"", "k", "M", "G", "T", "P", nullptr};
auto base = s.binary_ ? 1024ull : 1000ll; auto base = s.binary_ ? 1024ull : 1000ll;

2
src/client.cpp
View File

@ -123,7 +123,7 @@ void waybar::Client::handleMonitorAdded(Glib::RefPtr<Gdk::Monitor> monitor) {
} }
void waybar::Client::handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor) { void waybar::Client::handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor) {
spdlog::debug("Output removed: {} {}", monitor->get_manufacturer(), monitor->get_model()); spdlog::debug("Output removed: {} {}", monitor->get_manufacturer().c_str(), monitor->get_model().c_str());
/* This event can be triggered from wl_display_roundtrip called by GTK or our code. /* This event can be triggered from wl_display_roundtrip called by GTK or our code.
* Defer destruction of bars for the output to the next iteration of the event loop to avoid * Defer destruction of bars for the output to the next iteration of the event loop to avoid
* deleting objects referenced by currently executed code. * deleting objects referenced by currently executed code.