From 67d5a349dd55125a6df3ec437a0e0a09c3f92c56 Mon Sep 17 00:00:00 2001
From: Laszlo Nagy <rizsotto@gmail.com>
Date: Tue, 19 Jul 2022 19:51:05 +1000
Subject: [PATCH] dependency: directly import fmt features (not through spdlog)

---
 source/citnames/source/Application.cc                 | 2 +-
 source/citnames/source/semantic/Build.cc              | 2 +-
 source/intercept/source/collect/SessionWrapper.cc     | 4 ++--
 source/intercept/source/report/wrapper/Application.cc | 2 +-
 source/libmain/source/ApplicationFromArgs.cc          | 2 +-
 source/libmain/source/ApplicationLogConfig.cc         | 2 +-
 source/libsys/source/Process.cc                       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/citnames/source/Application.cc b/source/citnames/source/Application.cc
index bc1e44c5..ebe9538b 100644
--- 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
index b697d821..3de9007c 100644
--- 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
index 2e10e316..aaecf0f2 100644
--- 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
index f67a5293..bb36d91c 100644
--- 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
index 8ed82de0..37e4cf8c 100644
--- 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
index fcd9b914..073402cf 100644
--- 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
index 7f739a6d..ef89dbf3 100644
--- 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 {