Merge branch 'develop'

2017-03-04 23:43:49 -05:00
parent 0807efa91a 8c058dfeee
commit 494c0cd2c0
1 changed files with 2 additions and 1 deletions
--- a/include/boost/smart_ptr/allocate_shared_array.hpp
+++ b/include/boost/smart_ptr/allocate_shared_array.hpp
@ -110,7 +110,8 @@ struct sp_array_count<T[]> { };

 template<class D, class T>
 inline D*
-sp_get_deleter(const boost::shared_ptr<T>& value) BOOST_NOEXCEPT
+sp_get_deleter(const
+    boost::shared_ptr<T>& value) BOOST_NOEXCEPT_OR_NOTHROW
 {
    return static_cast<D*>(value._internal_get_untyped_deleter());
 }