From e792f1726b44e02cb201fd714b62844db95554cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Feroldi?= Date: Fri, 21 Jul 2017 02:24:41 -0300 Subject: [PATCH] Make MinGW work with noreturn attribute --- fmt/format.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fmt/format.h b/fmt/format.h index 1427218b..72e7c1bf 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -139,6 +139,15 @@ typedef __int64 intmax_t; # define FMT_HAS_CPP_ATTRIBUTE(x) 0 #endif +// Use the compiler's attribute noreturn +#if defined(__MINGW32__) || defined(__MINGW64__) +# define FMT_NORETURN __attribute__((noreturn)) +#elif FMT_HAS_CPP_ATTRIBUTE(noreturn) +# define FMT_NORETURN [[noreturn]] +#else +# define FMT_NORETURN +#endif + #ifndef FMT_USE_VARIADIC_TEMPLATES // Variadic templates are available in GCC since version 4.4 // (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++ @@ -923,11 +932,7 @@ struct IntTraits { TypeSelector::digits <= 32>::Type MainType; }; -#if FMT_HAS_CPP_ATTRIBUTE(noreturn) -FMT_API [[noreturn]] void report_unknown_type(char code, const char *type); -#else -FMT_API void report_unknown_type(char code, const char *type); -#endif +FMT_API FMT_NORETURN void report_unknown_type(char code, const char *type); // Static data is placed in this class template to allow header-only // configuration.