feedc0de/boost_throw_exception
1
0
Fork 0
forked from boostorg/throw_exception
Code Pull Requests Activity

Remove BOOST_ATTRIBUTE_NORETURN and use BOOST_NORETURN provided by Boost.Config instead.

Browse Source
This commit is contained in:
Andrey Semashev
2014-06-05 00:44:39 +04:00
parent e08b3aa75f
commit 37e726da58
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/exception/detail/attribute_noreturn.hpp
View File

@ -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

5
include/boost/throw_exception.hpp
View File

@ -26,7 +26,6 @@
// http://www.boost.org/libs/utility/throw_exception.html // http://www.boost.org/libs/utility/throw_exception.html
// //
#include <boost/exception/detail/attribute_noreturn.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <exception> #include <exception>
@ -60,7 +59,7 @@ void throw_exception( std::exception const & e ); // user defined
inline void throw_exception_assert_compatibility( std::exception const & ) { } inline void throw_exception_assert_compatibility( std::exception const & ) { }
template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const & e ) template<class E> BOOST_NORETURN inline void throw_exception( E const & e )
{ {
//All boost exceptions are required to derive from std::exception, //All boost exceptions are required to derive from std::exception,
//to ensure compatibility with BOOST_NO_EXCEPTIONS. //to ensure compatibility with BOOST_NO_EXCEPTIONS.
@ -80,7 +79,7 @@ template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const
exception_detail exception_detail
{ {
template <class E> template <class E>
BOOST_ATTRIBUTE_NORETURN BOOST_NORETURN
void void
throw_exception_( E const & x, char const * current_function, char const * file, int line ) throw_exception_( E const & x, char const * current_function, char const * file, int line )
{ {