mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 08:25:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gabime 2019-12-05 13:37:31 +02:00
parent d5a72b1eaf
commit 53d58f222f
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/spdlog/fmt/fmt.h
View File

@ -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 <fmt/format.h>
#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

13
src/fmt.cpp
View File

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