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

Merge pull request #439 from jbeich/fmt 

Unbreak with fmtlib 6.0.0
pull/443/head
Alex 2019-08-29 11:29:54 +02:00 committed by GitHub
parent c6d7a779b8 f592e3d38b
commit 02e43a38d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/modules/clock.hpp
View File

@ -1,8 +1,12 @@
#pragma once #pragma once
#include <fmt/format.h> #include <fmt/format.h>
#if FMT_VERSION < 60000
#include <fmt/time.h>
#else
#include <fmt/chrono.h>
#endif
#include "ALabel.hpp" #include "ALabel.hpp"
#include "fmt/time.h"
#include "util/sleeper_thread.hpp" #include "util/sleeper_thread.hpp"
namespace waybar::modules { namespace waybar::modules {

2
src/bar.cpp
View File

@ -1,7 +1,7 @@
#include "bar.hpp" #include "bar.hpp"
#include <spdlog/spdlog.h>
#include "client.hpp" #include "client.hpp"
#include "factory.hpp" #include "factory.hpp"
#include <spdlog/spdlog.h>
waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
: output(w_output), : output(w_output),

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

@ -1,6 +1,6 @@
#include "modules/sni/host.hpp" #include "modules/sni/host.hpp"
#include <spdlog/spdlog.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <spdlog/spdlog.h>
namespace waybar::modules::SNI { namespace waybar::modules::SNI {