Keep noexcept specifier when exceptions are disabled.

a317448b · Alexej Harm · Victor Zverovich · 0eb01b83 · a317448b
Commit a317448b authored Jul 13, 2018 by Alexej Harm Committed by Victor Zverovich Jul 13, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

include/fmt/core.h include/fmt/core.h +3 -1

No files found.
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -122,12 +122,14 @@
 #if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
    (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900
 # define FMT_DETECTED_NOEXCEPT noexcept
+# define FMT_HAS_CXX11_NOEXCEPT 1
 #else
 # define FMT_DETECTED_NOEXCEPT throw()
+# define FMT_HAS_CXX11_NOEXCEPT 0
 #endif

 #ifndef FMT_NOEXCEPT
-# if FMT_EXCEPTIONS
+# if FMT_EXCEPTIONS || FMT_HAS_CXX11_NOEXCEPT
 #  define FMT_NOEXCEPT FMT_DETECTED_NOEXCEPT
 # else
 #  define FMT_NOEXCEPT