mirror of
https://github.com/fmtlib/fmt.git
synced 2024-12-25 06:21:00 +00:00
Fix warnings when compiling with -Wundef
This commit is contained in:
parent
96d518f2f8
commit
b4b13ee2b8
@ -55,7 +55,7 @@ using fmt::internal::Arg;
|
||||
#if __GNUC__ && !__EXCEPTIONS
|
||||
# define FMT_EXCEPTIONS 0
|
||||
#endif
|
||||
#if _MSC_VER && !_HAS_EXCEPTIONS
|
||||
#if defined(_MSC_VER) && !_HAS_EXCEPTIONS
|
||||
# define FMT_EXCEPTIONS 0
|
||||
#endif
|
||||
#ifndef FMT_EXCEPTIONS
|
||||
@ -84,7 +84,7 @@ using fmt::internal::Arg;
|
||||
# define FMT_FUNC
|
||||
#endif
|
||||
|
||||
#if _MSC_VER
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable: 4127) // conditional expression is constant
|
||||
# pragma warning(disable: 4702) // unreachable code
|
||||
@ -1325,6 +1325,6 @@ template int fmt::internal::CharTraits<wchar_t>::format_float(
|
||||
|
||||
#endif // FMT_HEADER_ONLY
|
||||
|
||||
#if _MSC_VER
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
14
format.h
14
format.h
@ -48,6 +48,10 @@
|
||||
# include <sstream>
|
||||
#endif
|
||||
|
||||
#ifndef _SECURE_SCL
|
||||
# define _SECURE_SCL 0
|
||||
#endif
|
||||
|
||||
#if _SECURE_SCL
|
||||
# include <iterator>
|
||||
#endif
|
||||
@ -160,6 +164,10 @@ inline uint32_t clzll(uint64_t x) {
|
||||
#endif
|
||||
|
||||
// Define FMT_USE_NOEXCEPT to make C++ Format use noexcept (C++11 feature).
|
||||
#ifndef FMT_USE_NOEXCEPT
|
||||
# define FMT_USE_NOEXCEPT 0
|
||||
#endif
|
||||
|
||||
#ifndef FMT_NOEXCEPT
|
||||
# if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
|
||||
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \
|
||||
@ -172,6 +180,10 @@ inline uint32_t clzll(uint64_t x) {
|
||||
|
||||
// A macro to disallow the copy constructor and operator= functions
|
||||
// This should be used in the private: declarations for a class
|
||||
#ifndef FMT_USE_DELETED_FUNCTIONS
|
||||
# define FMT_USE_DELETED_FUNCTIONS 0
|
||||
#endif
|
||||
|
||||
#if FMT_USE_DELETED_FUNCTIONS || FMT_HAS_FEATURE(cxx_deleted_functions) || \
|
||||
(FMT_GCC_VERSION >= 404 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1800
|
||||
# define FMT_DELETED_OR_UNDEFINED = delete
|
||||
@ -2434,7 +2446,7 @@ void BasicWriter<Char>::write_double(
|
||||
Char fill = internal::CharTraits<Char>::cast(spec.fill());
|
||||
for (;;) {
|
||||
std::size_t buffer_size = buffer_.capacity() - offset;
|
||||
#if _MSC_VER
|
||||
#ifdef _MSC_VER
|
||||
// MSVC's vsnprintf_s doesn't work with zero size, so reserve
|
||||
// space for at least one extra character to make the size non-zero.
|
||||
// Note that the buffer's capacity will increase by more than 1.
|
||||
|
4
posix.h
4
posix.h
@ -69,6 +69,10 @@
|
||||
# define FMT_UNUSED
|
||||
#endif
|
||||
|
||||
#ifndef FMT_USE_STATIC_ASSERT
|
||||
# define FMT_USE_STATIC_ASSERT 0
|
||||
#endif
|
||||
|
||||
#if FMT_USE_STATIC_ASSERT || FMT_HAS_CPP_ATTRIBUTE(cxx_static_assert) || \
|
||||
(FMT_GCC_VERSION >= 403 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1600
|
||||
# define FMT_STATIC_ASSERT(cond, message) static_assert(cond, message)
|
||||
|
Loading…
Reference in New Issue
Block a user