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