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

suppress warning 4307 when including format-inline.h under msvc 2017

Browse Source
This commit is contained in:
gabime 2022-10-31 17:47:12 +02:00
parent a7e2bf161e
commit 14a29c03eb
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,9 +21,20 @@
# endif # endif
// enable the 'n' flag in for backward compatibility with fmt 6.x // enable the 'n' flag in for backward compatibility with fmt 6.x
# define FMT_DEPRECATED_N_SPECIFIER # define FMT_DEPRECATED_N_SPECIFIER
// suppress "integral constant overflow" warning under msvc 2017 (which doesn't appear in other msvc versions)
#if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916))
# pragma warning(push)
# pragma warning(disable : 4307)
#endif
# include <spdlog/fmt/bundled/core.h> # include <spdlog/fmt/bundled/core.h>
# include <spdlog/fmt/bundled/format.h> # include <spdlog/fmt/bundled/format.h>
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
# include <fmt/core.h> # include <fmt/core.h>
# include <fmt/format.h> # include <fmt/format.h>
#endif #endif
#if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916))
# pragma warning(pop)
#endif

4
src/bundled_fmtlib_format.cpp
View File

@ -9,13 +9,13 @@
#if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT) #if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT)
// suppress "integral constant overflow" warning under msvc 2017 (which doesn't appear in other msvc versions) // suppress "integral constant overflow" warning under msvc 2017 (which doesn't appear in other msvc versions)
#if defined(_MSC_VER) && (_MSC_VER >= 1910) && (_MSC_VER <= 1916) #if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916))
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4307) # pragma warning(disable : 4307)
#endif #endif
# include <spdlog/fmt/bundled/format-inl.h> # include <spdlog/fmt/bundled/format-inl.h>
#if defined(_MSC_VER) #if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916))
# pragma warning(pop) # pragma warning(pop)
#endif #endif