From 5f0725bb739eb86ff886e86d84ca0f4ebef226e2 Mon Sep 17 00:00:00 2001 From: Martin Shetty <1972005+martukas@users.noreply.github.com> Date: Fri, 18 Mar 2022 12:54:42 -0700 Subject: [PATCH] "downgrade spdlog and removed some hacks; updates #255" --- conanfile.txt | 6 +++--- source/core/util/logger.cpp | 1 - source/core/util/logger.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index a2a14ee6..1b011e80 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,12 +1,12 @@ [requires] -cli11/2.1.1 #bump to 2.1.2 requires conan upgrade +cli11/2.1.1 #bump to 2.1.2 requires conan upgrade date/3.0.1 -eigen/3.3.9 #bump to 3.4.0 requires conan upgrade +eigen/3.3.9 #bump to 3.4.0 requires conan upgrade gtest/1.10.0 fmt/8.1.1 librdkafka/1.6.0 #bump to 1.8.2 requires conan upgrade nlohmann_json/3.10.5 -spdlog/1.9.2 +spdlog/1.8.5 #bump to 1.9.2 requires conan upgrade h5cpp/0.4.1@ess-dmsc/stable logical-geometry/705ea61@ess-dmsc/stable qplot/6e192ab@ess-dmsc/stable diff --git a/source/core/util/logger.cpp b/source/core/util/logger.cpp index a7a1165a..c90808b0 100644 --- a/source/core/util/logger.cpp +++ b/source/core/util/logger.cpp @@ -4,7 +4,6 @@ #include #include -#include namespace spdlog { diff --git a/source/core/util/logger.h b/source/core/util/logger.h index 9599ba60..70086445 100644 --- a/source/core/util/logger.h +++ b/source/core/util/logger.h @@ -15,7 +15,6 @@ #include #include -#include /// Somehow spdlog fails to bring it along on its own #include #pragma GCC system_header