From 3117aefdf3e0bcae6671ab4669241c934bc9ec50 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 12 Jul 2022 22:20:49 -0700 Subject: [PATCH] fix: drop conditionals for ancient fmt versions --- include/modules/keyboard_state.hpp | 5 ----- include/modules/simpleclock.hpp | 6 +----- src/modules/clock.cpp | 9 ++------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp index 6af19d14..05fbec13 100644 --- a/include/modules/keyboard_state.hpp +++ b/include/modules/keyboard_state.hpp @@ -1,11 +1,6 @@ #pragma once -#include -#if FMT_VERSION < 60000 -#include -#else #include -#endif #include #include "AModule.hpp" diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp index aa9a0a22..5cbee4c6 100644 --- a/include/modules/simpleclock.hpp +++ b/include/modules/simpleclock.hpp @@ -1,11 +1,7 @@ #pragma once -#include -#if FMT_VERSION < 60000 -#include -#else #include -#endif + #include "ALabel.hpp" #include "util/sleeper_thread.hpp" diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 959cad90..467536e1 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -1,15 +1,10 @@ #include "modules/clock.hpp" +#include #include -#include -#if FMT_VERSION < 60000 -#include -#else -#include -#endif - #include +#include #include #include