[Boost-commit] svn:boost r45041 - in trunk: boost libs/exception/test

From: emil_at_[hidden]
Date: 2008-05-02 16:40:40

Author: emildotchevski
Date: 2008-05-02 16:40:39 EDT (Fri, 02 May 2008)
New Revision: 45041
URL: http://svn.boost.org/trac/boost/changeset/45041

Log:
throw_exception() now ensures that the exception type passed to it derives publicly from std::exception.
Added:
   trunk/libs/exception/test/throw_exception_fail.cpp   (contents, props changed)
Text files modified: 
   trunk/boost/throw_exception.hpp      |    13 ++++++++++---                           
   trunk/libs/exception/test/Jamfile.v2 |     1 +                                       
   2 files changed, 11 insertions(+), 3 deletions(-)

Modified: trunk/boost/throw_exception.hpp
==============================================================================
--- trunk/boost/throw_exception.hpp	(original)
+++ trunk/boost/throw_exception.hpp	2008-05-02 16:40:39 EDT (Fri, 02 May 2008)
@@ -11,10 +11,11 @@
 //  boost/throw_exception.hpp
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+//  Copyright (c) 2008 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)
+//  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)
 //
 //  http://www.boost.org/libs/utility/throw_exception.html
 //
@@ -39,8 +40,14 @@
 
 #else
 
+inline void throw_exception_assert_compatibility( std::exception const & ) { }
+
 template<class E> inline void throw_exception(E const & e)
 {
+    //All boost exceptions are required to derive std::exception,
+    //to ensure compatibility with BOOST_NO_EXCEPTIONS.
+    throw_exception_assert_compatibility(e);
+
 #ifndef BOOST_EXCEPTION_DISABLE
     throw enable_current_exception(enable_error_info(e));
 #else

Modified: trunk/libs/exception/test/Jamfile.v2
==============================================================================
--- trunk/libs/exception/test/Jamfile.v2	(original)
+++ trunk/libs/exception/test/Jamfile.v2	2008-05-02 16:40:39 EDT (Fri, 02 May 2008)
@@ -26,6 +26,7 @@
 run error_info_test.cpp ;
 run what_test.cpp ;
 compile-fail exception_fail.cpp ;
+compile-fail throw_exception_fail.cpp ;
 
 #headers
 compile enable_current_exception_hpp_test.cpp ;

Added: trunk/libs/exception/test/throw_exception_fail.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/exception/test/throw_exception_fail.cpp	2008-05-02 16:40:39 EDT (Fri, 02 May 2008)
@@ -0,0 +1,18 @@
+//Copyright (c) 2006-2008 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)
+
+#include <boost/throw_exception.hpp>
+
+struct
+my_exception
+	{
+	};
+
+void
+tester()
+    {
+	//Must not compile, throw_exception requires exception types to derive std::exception.
+	boost::throw_exception(my_exception());
+    }