From 37e726da58c5e82efd6e20672746b83f6d61e0cc Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Thu, 5 Jun 2014 00:44:39 +0400 Subject: [PATCH] Remove BOOST_ATTRIBUTE_NORETURN and use BOOST_NORETURN provided by Boost.Config instead. --- .../exception/detail/attribute_noreturn.hpp | 17 ----------------- include/boost/throw_exception.hpp | 5 ++--- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 include/boost/exception/detail/attribute_noreturn.hpp diff --git a/include/boost/exception/detail/attribute_noreturn.hpp b/include/boost/exception/detail/attribute_noreturn.hpp deleted file mode 100644 index ae9f031..0000000 --- a/include/boost/exception/detail/attribute_noreturn.hpp +++ /dev/null @@ -1,17 +0,0 @@ -//Copyright (c) 2009 Emil Dotchevski and Reverge Studios, Inc. - -//Distributed under the Boost Software License, Version 1.0. (See accompanying -//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -#ifndef UUID_61531AB0680611DEADD5846855D89593 -#define UUID_61531AB0680611DEADD5846855D89593 - -#if defined(_MSC_VER) -#define BOOST_ATTRIBUTE_NORETURN __declspec(noreturn) -#elif defined(__GNUC__) -#define BOOST_ATTRIBUTE_NORETURN __attribute__((__noreturn__)) -#else -#define BOOST_ATTRIBUTE_NORETURN -#endif - -#endif diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp index 200683e..aa977df 100644 --- a/include/boost/throw_exception.hpp +++ b/include/boost/throw_exception.hpp @@ -26,7 +26,6 @@ // http://www.boost.org/libs/utility/throw_exception.html // -#include #include #include #include @@ -60,7 +59,7 @@ void throw_exception( std::exception const & e ); // user defined inline void throw_exception_assert_compatibility( std::exception const & ) { } -template BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const & e ) +template BOOST_NORETURN inline void throw_exception( E const & e ) { //All boost exceptions are required to derive from std::exception, //to ensure compatibility with BOOST_NO_EXCEPTIONS. @@ -80,7 +79,7 @@ template BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const exception_detail { template - BOOST_ATTRIBUTE_NORETURN + BOOST_NORETURN void throw_exception_( E const & x, char const * current_function, char const * file, int line ) {