Commit b990080a authored by gabime's avatar gabime

Fixed fmt locale.h deprecation warning

parent efbe3e4d
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "spdlog/sinks/basic_file_sink.h" #include "spdlog/sinks/basic_file_sink.h"
#ifdef SPDLOG_FMT_EXTERNAL #ifdef SPDLOG_FMT_EXTERNAL
#include <fmt/locale.h> # include <fmt/format.h>
#else #else
#include "spdlog/fmt/bundled/locale.h" # include "spdlog/fmt/bundled/format.h"
#endif #endif
#include "utils.h" #include "utils.h"
...@@ -32,8 +32,8 @@ using namespace utils; ...@@ -32,8 +32,8 @@ using namespace utils;
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count); void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) # pragma warning(push)
#pragma warning(disable : 4996) // disable fopen warning under msvc # pragma warning(disable : 4996) // disable fopen warning under msvc
#endif // _MSC_VER #endif // _MSC_VER
int count_lines(const char *filename) int count_lines(const char *filename)
...@@ -64,7 +64,7 @@ void verify_file(const char *filename, int expected_count) ...@@ -64,7 +64,7 @@ void verify_file(const char *filename, int expected_count)
} }
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) # pragma warning(pop)
#endif #endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include "spdlog/sinks/rotating_file_sink.h" #include "spdlog/sinks/rotating_file_sink.h"
#ifdef SPDLOG_FMT_EXTERNAL #ifdef SPDLOG_FMT_EXTERNAL
#include <fmt/locale.h> # include <fmt/locale.h>
#else #else
#include "spdlog/fmt/bundled/locale.h" # include "spdlog/fmt/bundled/format.h"
#endif #endif
#include "utils.h" #include "utils.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment