From b990080a52e3c191f5b08019cb771c836caa649c Mon Sep 17 00:00:00 2001 From: gabime Date: Thu, 24 Jun 2021 17:22:06 +0300 Subject: [PATCH] Fixed fmt locale.h deprecation warning --- bench/async_bench.cpp | 12 ++++++------ bench/bench.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bench/async_bench.cpp b/bench/async_bench.cpp index c3ee247e..c9e2211f 100644 --- a/bench/async_bench.cpp +++ b/bench/async_bench.cpp @@ -11,9 +11,9 @@ #include "spdlog/sinks/basic_file_sink.h" #ifdef SPDLOG_FMT_EXTERNAL -#include +# include #else -#include "spdlog/fmt/bundled/locale.h" +# include "spdlog/fmt/bundled/format.h" #endif #include "utils.h" @@ -32,9 +32,9 @@ using namespace utils; void bench_mt(int howmany, std::shared_ptr log, int thread_count); #ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4996) // disable fopen warning under msvc -#endif // _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4996) // disable fopen warning under msvc +#endif // _MSC_VER int count_lines(const char *filename) { @@ -64,7 +64,7 @@ void verify_file(const char *filename, int expected_count) } #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif int main(int argc, char *argv[]) diff --git a/bench/bench.cpp b/bench/bench.cpp index 1abb1aa5..6ecd155b 100644 --- a/bench/bench.cpp +++ b/bench/bench.cpp @@ -13,9 +13,9 @@ #include "spdlog/sinks/rotating_file_sink.h" #ifdef SPDLOG_FMT_EXTERNAL -#include +# include #else -#include "spdlog/fmt/bundled/locale.h" +# include "spdlog/fmt/bundled/format.h" #endif #include "utils.h"