Unbreak build with fmtlib 6.0.0
In file included from ../src/factory.cpp:1: In file included from ../include/factory.hpp:4: ../include/modules/clock.hpp:5:10: fatal error: 'fmt/time.h' file not found #include "fmt/time.h" ^~~~~~~~~~~~ In file included from ../src/bar.cpp:4: In file included from ../include/factory.hpp:4: In file included from ../include/modules/clock.hpp:3: In file included from /usr/include/fmt/chrono.h:12: /usr/include/fmt/locale.h:19:35: error: parameter type 'fmt::v5::internal::buffer' (aka 'basic_buffer<char>') is an abstract class const std::locale& loc, buffer<Char>& buf, ^ /usr/include/spdlog/fmt/bundled/core.h:238:16: note: unimplemented pure virtual method 'grow' in 'basic_buffer' virtual void grow(std::size_t capacity) = 0; ^ In file included from ../src/modules/sni/host.cpp:3: /usr/include/fmt/ostream.h:22:9: error: expected member name or ';' after declaration specifiers buffer<Char>& buffer_; ~~~~~~^ /usr/include/fmt/ostream.h:25:19: error: expected ')' formatbuf(buffer<Char>& buf) : buffer_(buf) {} ^ /usr/include/fmt/ostream.h:25:12: note: to match this '(' formatbuf(buffer<Char>& buf) : buffer_(buf) {} ^ /usr/include/fmt/ostream.h:25:42: error: use of undeclared identifier 'buf'; did you mean 'prettify_handler::buf'? formatbuf(buffer<Char>& buf) : buffer_(buf) {} ^~~ prettify_handler::buf /usr/include/spdlog/fmt/bundled/format-inl.h:551:11: note: 'prettify_handler::buf' declared here buffer &buf; ^pull/439/head
parent
9d0842db48
commit
712424f9a8
|
@ -1,8 +1,12 @@
|
|||
#pragma once
|
||||
|
||||
#include <fmt/format.h>
|
||||
#if FMT_VERSION < 60000
|
||||
#include <fmt/time.h>
|
||||
#else
|
||||
#include <fmt/chrono.h>
|
||||
#endif
|
||||
#include "ALabel.hpp"
|
||||
#include "fmt/time.h"
|
||||
#include "util/sleeper_thread.hpp"
|
||||
|
||||
namespace waybar::modules {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "bar.hpp"
|
||||
#include <spdlog/spdlog.h>
|
||||
#include "client.hpp"
|
||||
#include "factory.hpp"
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
|
||||
: output(w_output),
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "modules/sni/host.hpp"
|
||||
#include <spdlog/spdlog.h>
|
||||
#include <fmt/ostream.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
namespace waybar::modules::SNI {
|
||||
|
||||
|
|
Loading…
Reference in New Issue