From 3ab1c234f5443dc19d5d5497cbef237f5c57133c Mon Sep 17 00:00:00 2001 From: Emil Dotchevski Date: Wed, 18 Nov 2009 23:05:55 +0000 Subject: [PATCH] Bug ticket 3641, also merging other fixes from the Release branch. [SVN r57765] --- include/boost/exception/detail/exception_ptr_base.hpp | 7 +++++++ include/boost/exception_ptr.hpp | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/include/boost/exception/detail/exception_ptr_base.hpp b/include/boost/exception/detail/exception_ptr_base.hpp index d261c18..ac68cab 100644 --- a/include/boost/exception/detail/exception_ptr_base.hpp +++ b/include/boost/exception/detail/exception_ptr_base.hpp @@ -19,6 +19,13 @@ boost virtual void _rethrow() const=0; virtual bool _empty() const=0; + + protected: + + virtual + ~exception_ptr_base() throw() + { + } }; } } diff --git a/include/boost/exception_ptr.hpp b/include/boost/exception_ptr.hpp index 91dce25..0d18db1 100644 --- a/include/boost/exception_ptr.hpp +++ b/include/boost/exception_ptr.hpp @@ -90,6 +90,10 @@ boost { } + ~exception_ptr() throw() + { + } + operator unspecified_bool_type() const { return _empty() ? 0 : &exception_ptr::bad_alloc_;