dependency: directly import fmt features (not through spdlog)

rizsotto · Jul 19, 2022 · 67d5a34 · 67d5a34
1 parent e92ea46
commit 67d5a34
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/source/citnames/source/Application.cc b/source/citnames/source/Application.cc
@@ -31,8 +31,8 @@
 #ifdef HAVE_FMT_STD_H
 #include <fmt/std.h>
 #endif
+#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ostr.h>
 
 namespace fs = std::filesystem;
 namespace db = ic::collect::db;

diff --git a/source/citnames/source/semantic/Build.cc b/source/citnames/source/semantic/Build.cc
@@ -29,8 +29,8 @@
 #include <memory>
 #include <utility>
 
+#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ostr.h>
 
 #ifdef FMT_NEEDS_OSTREAM_FORMATTER
 template <> struct fmt::formatter<domain::Execution> : ostream_formatter {};

diff --git a/source/intercept/source/collect/SessionWrapper.cc b/source/intercept/source/collect/SessionWrapper.cc
@@ -28,9 +28,9 @@
 #ifdef HAVE_FMT_STD_H
 #include <fmt/std.h>
 #endif
+#include <fmt/ostream.h>
+#include <fmt/ranges.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ostr.h>
-#include <spdlog/fmt/ranges.h>
 
 #include <algorithm>
 #include <iterator>

diff --git a/source/intercept/source/report/wrapper/Application.cc b/source/intercept/source/report/wrapper/Application.cc
@@ -27,8 +27,8 @@
 #include "libsys/Process.h"
 #include "libsys/Signal.h"
 
+#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ostr.h>
 
 #include <filesystem>
 #include <memory>

diff --git a/source/libmain/source/ApplicationFromArgs.cc b/source/libmain/source/ApplicationFromArgs.cc
@@ -19,8 +19,8 @@
 
 #include "libmain/ApplicationFromArgs.h"
 
+#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ostr.h>
 #include <spdlog/sinks/stdout_sinks.h>
 
 #ifdef FMT_NEEDS_OSTREAM_FORMATTER

diff --git a/source/libmain/source/ApplicationLogConfig.cc b/source/libmain/source/ApplicationLogConfig.cc
@@ -20,8 +20,8 @@
 #include "libmain/ApplicationLogConfig.h"
 #include "config.h"
 
+#include <fmt/ranges.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ranges.h>
 #include <spdlog/sinks/stdout_sinks.h>
 
 #ifdef HAVE_SYS_UTSNAME_H

diff --git a/source/libsys/source/Process.cc b/source/libsys/source/Process.cc
@@ -44,8 +44,8 @@
 #  include "libsys/lib-names.h"
 #endif
 
+#include <fmt/ranges.h>
 #include <spdlog/spdlog.h>
-#include <spdlog/fmt/ranges.h>
 #include <spdlog/sinks/stdout_sinks.h>
 
 namespace {