mirror of
https://github.com/fmtlib/fmt.git
synced 2026-07-30 16:26:27 +08:00
Merge branch 'main' into fix-compile-format-as
This commit is contained in:
commit
3d6024f2ff
@ -223,6 +223,11 @@
|
||||
#else
|
||||
# define FMT_PRAGMA_CLANG(x)
|
||||
#endif
|
||||
#if FMT_MSC_VERSION
|
||||
# define FMT_PRAGMA_MSVC(x) __pragma(x)
|
||||
#else
|
||||
# define FMT_PRAGMA_MSVC(x)
|
||||
#endif
|
||||
|
||||
#ifndef FMT_USE_OPTIMIZE_PRAGMA
|
||||
# define FMT_USE_OPTIMIZE_PRAGMA 1
|
||||
@ -235,6 +240,9 @@ FMT_PRAGMA_GCC(push_options)
|
||||
FMT_PRAGMA_GCC(optimize("Og"))
|
||||
#endif
|
||||
|
||||
FMT_PRAGMA_MSVC(warning(push))
|
||||
FMT_PRAGMA_MSVC(warning(disable : 4702))
|
||||
|
||||
#ifdef FMT_DEPRECATED
|
||||
// Use the provided definition.
|
||||
#elif FMT_HAS_CPP14_ATTRIBUTE(deprecated)
|
||||
@ -2936,6 +2944,7 @@ FMT_INLINE void println(format_string<T...> fmt, T&&... args) {
|
||||
}
|
||||
|
||||
FMT_PRAGMA_GCC(pop_options)
|
||||
FMT_PRAGMA_MSVC(warning(pop))
|
||||
FMT_END_EXPORT
|
||||
FMT_END_NAMESPACE
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user