Keep noexcept specifier when exceptions are disabled.

This commit is contained in:
Alexej Harm 2018-07-13 14:04:43 +02:00 committed by Victor Zverovich
parent 0eb01b832c
commit a317448bd4

View File

@ -122,12 +122,14 @@
#if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \ #if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900 (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900
# define FMT_DETECTED_NOEXCEPT noexcept # define FMT_DETECTED_NOEXCEPT noexcept
# define FMT_HAS_CXX11_NOEXCEPT 1
#else #else
# define FMT_DETECTED_NOEXCEPT throw() # define FMT_DETECTED_NOEXCEPT throw()
# define FMT_HAS_CXX11_NOEXCEPT 0
#endif #endif
#ifndef FMT_NOEXCEPT #ifndef FMT_NOEXCEPT
# if FMT_EXCEPTIONS # if FMT_EXCEPTIONS || FMT_HAS_CXX11_NOEXCEPT
# define FMT_NOEXCEPT FMT_DETECTED_NOEXCEPT # define FMT_NOEXCEPT FMT_DETECTED_NOEXCEPT
# else # else
# define FMT_NOEXCEPT # define FMT_NOEXCEPT