diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index f4be282c..eaa701d9 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -14,7 +14,15 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #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) #ifdef SPDLOG_HEADER_ONLY @@ -32,6 +40,11 @@ #include #endif +// pop warnings supressions #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop +#endif + +#if defined(_MSC_VER) && _MSC_VER <= 1900 +#pragma warning( pop ) #endif \ No newline at end of file diff --git a/src/fmt.cpp b/src/fmt.cpp index 790c74b6..2cf00d9b 100644 --- a/src/fmt.cpp +++ b/src/fmt.cpp @@ -12,13 +12,26 @@ #pragma GCC diagnostic ignored "-Wsign-conversion" #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) #include "spdlog/fmt/bundled/format-inl.h" + +// pop warnings supressions + #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop #endif +#if defined(_MSC_VER) && _MSC_VER <= 1900 +#pragma warning( pop ) +#endif + FMT_BEGIN_NAMESPACE template struct FMT_API internal::basic_data;