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

Subject: [Boost-commit] svn:boost r60638 - trunk/boost
From: emil_at_[hidden]
Date: 2010-03-15 22:41:50

Author: emildotchevski
Date: 2010-03-15 22:41:49 EDT (Mon, 15 Mar 2010)
New Revision: 60638
URL: http://svn.boost.org/trac/boost/changeset/60638

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

Modified: trunk/boost/throw_exception.hpp
==============================================================================
--- trunk/boost/throw_exception.hpp	(original)
+++ trunk/boost/throw_exception.hpp	2010-03-15 22:41:49 EDT (Mon, 15 Mar 2010)
@@ -1,5 +1,11 @@
 #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
 
@@ -20,7 +26,6 @@
 //  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>
@@ -71,7 +76,7 @@
 
 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> inline void throw_exception( E const & e )
 {
     //All boost exceptions are required to derive from std::exception,
     //to ensure compatibility with BOOST_NO_EXCEPTIONS.
@@ -88,4 +93,7 @@
 
 } // namespace boost
 
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(pop)
+#endif
 #endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED