From a587a7ac55fc533799b313ff3dab9f07f94ff58d Mon Sep 17 00:00:00 2001 From: Emil Dotchevski Date: Wed, 17 Mar 2010 19:39:36 +0000 Subject: [PATCH] undoing previous commit. [SVN r60679] --- include/boost/throw_exception.hpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp index cbccfaf..1d018c5 100644 --- a/include/boost/throw_exception.hpp +++ b/include/boost/throw_exception.hpp @@ -1,11 +1,5 @@ #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED #define BOOST_THROW_EXCEPTION_HPP_INCLUDED -#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) -#pragma GCC system_header -#endif -#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) -#pragma warning(push,1) -#endif // MS compatible compilers support #pragma once @@ -26,6 +20,7 @@ // http://www.boost.org/libs/utility/throw_exception.html // +#include #include #include #include @@ -76,7 +71,7 @@ void throw_exception( std::exception const & e ); // user defined inline void throw_exception_assert_compatibility( std::exception const & ) { } -template inline void throw_exception( E const & e ) +template BOOST_ATTRIBUTE_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. @@ -93,7 +88,4 @@ template inline void throw_exception( E const & e ) } // namespace boost -#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) -#pragma warning(pop) -#endif #endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED