From f878c887a27dca78bff7b158203e729e8ee65444 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Fri, 5 Sep 2014 14:46:47 -0400 Subject: [PATCH] Fix build for external boost 1.56.0 exception/detail/attribute_noreturn.hpp has been removed in 1.56. We shouldn't have used a detail header in the first place. In master we can use GMX_ATTRIBUTE_NORETURN but 5.0.x it is defined only for code analysis not for compilers. Change-Id: I6f26d6ddc62c73f583d324f7c794a499c274b394 --- src/gromacs/utility/gmxassert.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gromacs/utility/gmxassert.h b/src/gromacs/utility/gmxassert.h index 0259b611f1..941faaeaa4 100644 --- a/src/gromacs/utility/gmxassert.h +++ b/src/gromacs/utility/gmxassert.h @@ -44,7 +44,6 @@ #define GMX_UTILITY_GMXASSERT_H #include -#include //! \addtogroup module_utility //! \{ @@ -100,7 +99,11 @@ namespace internal * * \ingroup module_utility */ -BOOST_ATTRIBUTE_NORETURN +#if defined(_MSC_VER) +__declspec(noreturn) +#elif defined(__GNUC__) +__attribute__((__noreturn__)) +#endif void assertHandler(const char *condition, const char *msg, const char *func, const char *file, int line); -- 2.22.0