mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-03-31 02:12:40 +08:00
Code

Rvert suppressing msvc2017 warnings and fix ci instead

Browse Source
This commit is contained in:
gabime 2022-10-31 22:51:41 +02:00
parent 6c975fa13b
commit b59b4a2b45
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
appveyor.yml
View File

@ -41,7 +41,7 @@ environment:
- GENERATOR: '"Visual Studio 15 2017 Win64"' - GENERATOR: '"Visual Studio 15 2017 Win64"'
BUILD_TYPE: Debug BUILD_TYPE: Debug
BUILD_SHARED: 'OFF' BUILD_SHARED: 'OFF'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'OFF'
WCHAR: 'ON' WCHAR: 'ON'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'ON' BUILD_EXAMPLE: 'ON'
@ -50,7 +50,7 @@ environment:
- GENERATOR: '"Visual Studio 15 2017 Win64"' - GENERATOR: '"Visual Studio 15 2017 Win64"'
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'OFF' BUILD_SHARED: 'OFF'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'OFF'
WCHAR: 'OFF' WCHAR: 'OFF'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'ON' BUILD_EXAMPLE: 'ON'
@ -59,7 +59,7 @@ environment:
- GENERATOR: '"Visual Studio 15 2017 Win64"' - GENERATOR: '"Visual Studio 15 2017 Win64"'
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'OFF'
WCHAR: 'OFF' WCHAR: 'OFF'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'ON' BUILD_EXAMPLE: 'ON'
@ -68,7 +68,7 @@ environment:
- GENERATOR: '"Visual Studio 15 2017 Win64"' - GENERATOR: '"Visual Studio 15 2017 Win64"'
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'OFF'
WCHAR: 'ON' WCHAR: 'ON'
WCHAR_FILES: 'ON' WCHAR_FILES: 'ON'
BUILD_EXAMPLE: 'OFF' BUILD_EXAMPLE: 'OFF'

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

@ -21,23 +21,13 @@
# 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
// enable ostream formatting for backward compatibility with fmt 8.x
// enable the ostream formatting for backward compatibility with fmt 8.x
# define FMT_DEPRECATED_OSTREAM # 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/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

12
src/bundled_fmtlib_format.cpp
View File

@ -8,17 +8,7 @@
#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) #include <spdlog/fmt/bundled/format-inl.h>
#if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916))
# pragma warning(push)
# pragma warning(disable : 4307)
#endif
# include <spdlog/fmt/bundled/format-inl.h>
#if defined(_MSC_VER) && ((_MSC_VER >= 1910) && (_MSC_VER <= 1916))
# pragma warning(pop)
#endif
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
namespace detail { namespace detail {