[Boost-commit] svn:boost r81714 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail

Subject: [Boost-commit] svn:boost r81714 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail
From: pdimov_at_[hidden]
Date: 2012-12-04 22:44:41

Author: pdimov
Date: 2012-12-04 22:44:40 EST (Tue, 04 Dec 2012)
New Revision: 81714
URL: http://svn.boost.org/trac/boost/changeset/81714

Log:
Merged revision(s) 81488 from trunk: Apply patch from #7722. Fixes #7722.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/smart_ptr/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/detail/shared_count.hpp |     5 ++++-                                   
   1 files changed, 4 insertions(+), 1 deletions(-)

Modified: branches/release/boost/smart_ptr/detail/shared_count.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/shared_count.hpp	(original)
+++ branches/release/boost/smart_ptr/detail/shared_count.hpp	2012-12-04 22:44:40 EST (Tue, 04 Dec 2012)
@@ -35,7 +35,10 @@
 // rather than including <memory> directly:
 #include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
 #include <functional>       // std::less
-#include <new>              // std::bad_alloc
+
+#ifdef BOOST_NO_EXCEPTIONS
+# include <new>              // std::bad_alloc
+#endif
 
 #if !defined( BOOST_NO_CXX11_SMART_PTR )
 # include <boost/utility/addressof.hpp>