[Boost-commit] svn:boost r60679 - trunk/boost

Subject: [Boost-commit] svn:boost r60679 - trunk/boost
From: emil_at_[hidden]
Date: 2010-03-17 15:39:36

Author: emildotchevski
Date: 2010-03-17 15:39:36 EDT (Wed, 17 Mar 2010)
New Revision: 60679
URL: http://svn.boost.org/trac/boost/changeset/60679

Log:
undoing previous commit.
Text files modified: 
   trunk/boost/throw_exception.hpp |    12 ++----------                            
   1 files changed, 2 insertions(+), 10 deletions(-)

Modified: trunk/boost/throw_exception.hpp
==============================================================================
--- trunk/boost/throw_exception.hpp	(original)
+++ trunk/boost/throw_exception.hpp	2010-03-17 15:39:36 EDT (Wed, 17 Mar 2010)
@@ -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 <boost/exception/detail/attribute_noreturn.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/config.hpp>
 #include <exception>
@@ -76,7 +71,7 @@
 
 inline void throw_exception_assert_compatibility( std::exception const & ) { }
 
-template<class E> inline void throw_exception( E const & e )
+template<class E> 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 @@
 
 } // namespace boost
 
-#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma warning(pop)
-#endif
 #endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED