[Boost-commit] svn:boost r57764 - in branches/release/boost: . exception exception/detail

Subject: [Boost-commit] svn:boost r57764 - in branches/release/boost: . exception exception/detail
From: emil_at_[hidden]
Date: 2009-11-18 18:00:42

Author: emildotchevski
Date: 2009-11-18 18:00:41 EST (Wed, 18 Nov 2009)
New Revision: 57764
URL: http://svn.boost.org/trac/boost/changeset/57764

Log:
Bug ticket 3641, also merging other fixes from Trunk.
Text files modified: 
   branches/release/boost/exception/detail/object_hex_dump.hpp |     5 +++--                                   
   branches/release/boost/exception/exception.hpp              |     2 +-                                      
   branches/release/boost/exception_ptr.hpp                    |     4 ++++                                    
   3 files changed, 8 insertions(+), 3 deletions(-)

Modified: branches/release/boost/exception/detail/object_hex_dump.hpp
==============================================================================
--- branches/release/boost/exception/detail/object_hex_dump.hpp	(original)
+++ branches/release/boost/exception/detail/object_hex_dump.hpp	2009-11-18 18:00:41 EST (Wed, 18 Nov 2009)
@@ -11,6 +11,7 @@
 #include <ios>
 #include <string>
 #include <sstream>
+#include <cstdlib>
 
 namespace
 boost
@@ -21,11 +22,11 @@
         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);

Modified: branches/release/boost/exception/exception.hpp
==============================================================================
--- branches/release/boost/exception/exception.hpp	(original)
+++ branches/release/boost/exception/exception.hpp	2009-11-18 18:00:41 EST (Wed, 18 Nov 2009)
@@ -303,7 +303,7 @@
         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;
             };
         }
 

Modified: branches/release/boost/exception_ptr.hpp
==============================================================================
--- branches/release/boost/exception_ptr.hpp	(original)
+++ branches/release/boost/exception_ptr.hpp	2009-11-18 18:00:41 EST (Wed, 18 Nov 2009)
@@ -90,6 +90,10 @@
             {
             }
 
+        ~exception_ptr() throw()
+            {
+            }
+
         operator unspecified_bool_type() const
             {
             return _empty() ? 0 : &exception_ptr::bad_alloc_;