From d4eb9328cab00a1fd8898dfb60e5f19b7dc9b68b Mon Sep 17 00:00:00 2001
From: Emil Dotchevski <emil@revergestudios.com>
Date: Wed, 18 Nov 2009 23:00:41 +0000
Subject: [PATCH] Bug ticket 3641, also merging other fixes from Trunk.

[SVN r57764]
---
 include/boost/exception/detail/object_hex_dump.hpp | 5 +++--
 include/boost/exception/exception.hpp              | 2 +-
 include/boost/exception_ptr.hpp                    | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/boost/exception/detail/object_hex_dump.hpp b/include/boost/exception/detail/object_hex_dump.hpp
index f535944..75a4179 100644
--- a/include/boost/exception/detail/object_hex_dump.hpp
+++ b/include/boost/exception/detail/object_hex_dump.hpp
@@ -11,6 +11,7 @@
 #include <ios>
 #include <string>
 #include <sstream>
+#include <cstdlib>
 
 namespace
 boost
@@ -21,11 +22,11 @@ boost
         template <class T>
         inline
         std::string
-        object_hex_dump( T const & x, size_t max_size=16 )
+        object_hex_dump( T const & x, std::size_t max_size=16 )
             {
             std::ostringstream s;
             s << "type: " << type_name<T>() << ", size: " << sizeof(T) << ", dump: ";
-            size_t n=sizeof(T)>max_size?max_size:sizeof(T);
+            std::size_t n=sizeof(T)>max_size?max_size:sizeof(T);
             s.fill('0');
             s.width(2);
             unsigned char const * b=reinterpret_cast<unsigned char const *>(&x);
diff --git a/include/boost/exception/exception.hpp b/include/boost/exception/exception.hpp
index e7faf59..fbc0594 100644
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@@ -303,7 +303,7 @@ boost
         struct
         enable_error_info_return_type
             {
-            typedef typename enable_error_info_helper<T,sizeof(dispatch((T*)0))>::type type;
+            typedef typename enable_error_info_helper<T,sizeof(exception_detail::dispatch((T*)0))>::type type;
             };
         }
 
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_;