Merge pull request #1773 from Ryan-rsm-McKenzie/v1.x

ensure SPDLOG_FMT_EXTERNAL is honored throughout whole codebase

Merge pull request #1773 from Ryan-rsm-McKenzie/v1.x
ensure SPDLOG_FMT_EXTERNAL is honored throughout whole codebase
6aaaabbc · Gabi Melman · GitHub · a5f41391 · 42c36f48 · 6aaaabbc
Unverified Commit 6aaaabbc authored Dec 27, 2020 by Gabi Melman Committed by GitHub Dec 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

bench/async_bench.cpp bench/async_bench.cpp +5 -0

bench/bench.cpp bench/bench.cpp +5 -0

No files found.
--- a/bench/async_bench.cpp
+++ b/bench/async_bench.cpp
@@ -9,7 +9,12 @@
 #include "spdlog/spdlog.h"
 #include "spdlog/async.h"
 #include "spdlog/sinks/basic_file_sink.h"
+
+#ifdef SPDLOG_FMT_EXTERNAL
+#include <fmt/locale.h>
+#else
 #include "spdlog/fmt/bundled/locale.h"
+#endif

 #include "utils.h"
 #include <atomic>

--- a/bench/bench.cpp
+++ b/bench/bench.cpp
@@ -11,7 +11,12 @@
 #include "spdlog/sinks/daily_file_sink.h"
 #include "spdlog/sinks/null_sink.h"
 #include "spdlog/sinks/rotating_file_sink.h"
+
+#ifdef SPDLOG_FMT_EXTERNAL
+#include <fmt/locale.h>
+#else
 #include "spdlog/fmt/bundled/locale.h"
+#endif

 #include "utils.h"
 #include <atomic>