Merge branch 'develop'

This commit is contained in:
Peter Dimov
2014-06-05 00:38:40 +03:00

View File

@ -34,7 +34,7 @@ namespace
boost boost
{ {
class exception_ptr; class exception_ptr;
BOOST_ATTRIBUTE_NORETURN void rethrow_exception( exception_ptr const & ); BOOST_NORETURN void rethrow_exception( exception_ptr const & );
exception_ptr current_exception(); exception_ptr current_exception();
class class
@ -454,7 +454,7 @@ boost
return ret; return ret;
} }
BOOST_ATTRIBUTE_NORETURN BOOST_NORETURN
inline inline
void void
rethrow_exception( exception_ptr const & p ) rethrow_exception( exception_ptr const & p )