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

ensure SPDLOG_FMT_EXTERNAL is honored throughout whole codebase
This commit is contained in:
Gabi Melman 2020-12-27 11:17:30 +02:00 committed by GitHub
commit 6aaaabbc4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View File

@ -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>

View File

@ -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>