diff options
| author | gabime <gmelman1@gmail.comx> | 2022-10-31 23:51:41 +0300 |
|---|---|---|
| committer | gabime <gmelman1@gmail.comx> | 2022-10-31 23:52:01 +0300 |
| commit | b59b4a2b4563b3ca3cfaaf0cb62273a3d40c8b13 (patch) | |
| tree | 4e8a2bd3c0ab90672ac762a43da043340b6242d9 /include/spdlog | |
| parent | 6c975fa13b01116c2ba9b0f3af336ad28f16e2f9 (diff) | |
Rvert suppressing msvc2017 warnings and fix ci instead
Diffstat (limited to 'include/spdlog')
| -rw-r--r-- | include/spdlog/fmt/fmt.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index 73137085..90fcae0f 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -21,23 +21,13 @@ # endif // enable the 'n' flag in for backward compatibility with fmt 6.x # define FMT_DEPRECATED_N_SPECIFIER - -// enable the ostream formatting for backward compatibility with fmt 8.x +// enable ostream formatting for backward compatibility with fmt 8.x # define FMT_DEPRECATED_OSTREAM -// 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/format.h> + #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib # include <fmt/core.h> # include <fmt/format.h> #endif - -#if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916)) -# pragma warning(pop) -#endif |