Commit 53d58f22 authored by gabime's avatar gabime

fix warning C4996 under vs2015 about std::copy in fmt

parent d5a72b1e
...@@ -14,7 +14,15 @@ ...@@ -14,7 +14,15 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#endif #endif // __GNUC__ || __clang__
// fix warning C4996 under vs2015 about std::copy in fmt
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( push )
#pragma warning( disable : 4996 )
#endif
#if !defined(SPDLOG_FMT_EXTERNAL) #if !defined(SPDLOG_FMT_EXTERNAL)
#ifdef SPDLOG_HEADER_ONLY #ifdef SPDLOG_HEADER_ONLY
...@@ -32,6 +40,11 @@ ...@@ -32,6 +40,11 @@
#include <fmt/format.h> #include <fmt/format.h>
#endif #endif
// pop warnings supressions
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( pop )
#endif #endif
\ No newline at end of file
...@@ -12,13 +12,26 @@ ...@@ -12,13 +12,26 @@
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#endif #endif
// fix warning C4996 under vs2015 about std::copy in fmt
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( push )
#pragma warning( disable : 4996 )
#endif
#if !defined(SPDLOG_FMT_EXTERNAL) #if !defined(SPDLOG_FMT_EXTERNAL)
#include "spdlog/fmt/bundled/format-inl.h" #include "spdlog/fmt/bundled/format-inl.h"
// pop warnings supressions
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( pop )
#endif
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
template struct FMT_API internal::basic_data<void>; template struct FMT_API internal::basic_data<void>;
......
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