From eb810d49cb2126523c165a65458c35a018ccbe4b Mon Sep 17 00:00:00 2001
From: Emil Dotchevski <emil@revergestudios.com>
Date: Sat, 3 Jul 2010 21:32:02 +0000
Subject: [PATCH] merging changes from trunk.

[SVN r63565]
---
 doc/boost_exception_get_error_info_hpp.html   |  4 +-
 doc/get_error_info.html                       |  4 +-
 .../boost/exception/detail/exception_ptr.hpp  | 12 +++---
 include/boost/exception/exception.hpp         |  8 ++--
 include/boost/exception/info.hpp              | 13 ++++--
 include/boost/throw_exception.hpp             | 40 +++++++++----------
 test/no_exceptions_test.cpp                   |  2 +
 test/refcount_ptr_test.cpp                    |  9 ++++-
 8 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/doc/boost_exception_get_error_info_hpp.html b/doc/boost_exception_get_error_info_hpp.html
index 1850ab8..55fe7ca 100644
--- a/doc/boost_exception_get_error_info_hpp.html
+++ b/doc/boost_exception_get_error_info_hpp.html
@@ -28,10 +28,10 @@ namespace
 boost
     {
 <span class="RenoIncludeSPAN">    <span class="RenoIncludeSPAN">template &lt;class ErrorInfo,class E&gt;
-    typename ErrorInfo::<span class="RenoLink"><a href="error_info::value_type">error_info::value_type</a></span> const * <span class="RenoLink"><a href="get_error_info">get_error_info</a></span>( E const &amp; x );
+    typename ErrorInfo::<span class="RenoLink"><a href="error_info_value_type.html">error_info::value_type</a></span> const * <span class="RenoLink"><a href="get_error_info.html">get_error_info</a></span>( E const &amp; x );
     
     template &lt;class ErrorInfo,class E&gt;
-    typename ErrorInfo::<span class="RenoLink"><a href="error_info::value_type">error_info::value_type</a></span> * <span class="RenoLink"><a href="get_error_info">get_error_info</a></span>( E &amp; x );</span></span>
+    typename ErrorInfo::<span class="RenoLink"><a href="error_info_value_type.html">error_info::value_type</a></span> * <span class="RenoLink"><a href="get_error_info.html">get_error_info</a></span>( E &amp; x );</span></span>
     }</pre>
 </div></div><div class="RenoAutoDIV"><div class="RenoHR"><hr/></div>
 See also: <span class="RenoPageList"><a href="boost_exception_all_hpp.html">boost/exception/all.hpp</a>&nbsp;| <a href="error_info.html">error_info</a></span>
diff --git a/doc/get_error_info.html b/doc/get_error_info.html
index b6b4196..90b5fcc 100644
--- a/doc/get_error_info.html
+++ b/doc/get_error_info.html
@@ -25,10 +25,10 @@
 boost
     {
 <span class="RenoIncludeSPAN">    template &lt;class ErrorInfo,class E&gt;
-    typename ErrorInfo::<span class="RenoLink"><a href="error_info::value_type">error_info::value_type</a></span> const * <span class="RenoLink"><a href="get_error_info">get_error_info</a></span>( E const &amp; x );
+    typename ErrorInfo::<span class="RenoLink"><a href="error_info_value_type.html">error_info::value_type</a></span> const * get_error_info( E const &amp; x );
     
     template &lt;class ErrorInfo,class E&gt;
-    typename ErrorInfo::<span class="RenoLink"><a href="error_info::value_type">error_info::value_type</a></span> * <span class="RenoLink"><a href="get_error_info">get_error_info</a></span>( E &amp; x );</span>
+    typename ErrorInfo::<span class="RenoLink"><a href="error_info_value_type.html">error_info::value_type</a></span> * get_error_info( E &amp; x );</span>
     }</pre>
 </div><h4>Requirements:</h4>
 <div><ul><li> ErrorInfo must be an instance of the <span class="RenoLink"><a href="error_info.html">error_info</a></span> template.</li>
diff --git a/include/boost/exception/detail/exception_ptr.hpp b/include/boost/exception/detail/exception_ptr.hpp
index 59686e9..0510fe2 100644
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@@ -73,12 +73,14 @@ boost
         exception_ptr
         get_bad_alloc()
             {
-            static exception_ptr e = boost::copy_exception(
-                bad_alloc_() <<
-                throw_function("boost::current_exception()") <<
+            bad_alloc_ ba;
+            exception_detail::clone_impl<bad_alloc_> c(ba);
+            c <<
+                throw_function(BOOST_CURRENT_FUNCTION) <<
                 throw_file(__FILE__) <<
-                throw_line(__LINE__) );
-            return e;
+                throw_line(__LINE__);
+            static exception_ptr ep(new exception_detail::clone_impl<bad_alloc_>(c));
+            return ep;
             }
 
         template <int Dummy>
diff --git a/include/boost/exception/exception.hpp b/include/boost/exception/exception.hpp
index fd516dd..adaac68 100644
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@@ -75,8 +75,8 @@ boost
             void
             release()
                 {
-                if( px_ )
-                    px_->release();
+                if( px_ && px_->release() )
+                    px_=0;
                 }
             };
         }
@@ -134,7 +134,7 @@ boost
 
     class exception;
 
-    template <class>
+    template <class T>
     class shared_ptr;
 
     namespace
@@ -150,7 +150,7 @@ boost
             virtual shared_ptr<error_info_base> get( type_info_ const & ) const = 0;
             virtual void set( shared_ptr<error_info_base> const &, type_info_ const & ) = 0;
             virtual void add_ref() const = 0;
-            virtual void release() const = 0;
+            virtual bool release() const = 0;
             virtual refcount_ptr<exception_detail::error_info_container> clone() const = 0;
 
             protected:
diff --git a/include/boost/exception/info.hpp b/include/boost/exception/info.hpp
index 7aeeee5..c918dbd 100644
--- a/include/boost/exception/info.hpp
+++ b/include/boost/exception/info.hpp
@@ -114,8 +114,8 @@ boost
                     tmp << header;
                     for( error_info_map::const_iterator i=info_.begin(),end=info_.end(); i!=end; ++i )
                         {
-                        shared_ptr<error_info_base const> const & x = i->second;
-                        tmp << '[' << x->tag_typeid_name() << "] = " << x->value_as_string() << '\n';
+                        error_info_base const & x = *i->second;
+                        tmp << '[' << x.tag_typeid_name() << "] = " << x.value_as_string() << '\n';
                         }
                     tmp.str().swap(diagnostic_info_str_);
                     }
@@ -140,11 +140,16 @@ boost
                 ++count_;
                 }
 
-            void
+            bool
             release() const
                 {
-                if( !--count_ )
+                if( --count_ )
+                    return false;
+                else
+                    {
                     delete this;
+                    return true;
+                    }
                 }
 
             refcount_ptr<error_info_container>
diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp
index 1d018c5..a384054 100644
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@@ -43,26 +43,6 @@
 
 namespace boost
 {
-#if !defined( BOOST_EXCEPTION_DISABLE )
-    namespace
-    exception_detail
-    {
-        template <class E>
-        void
-        throw_exception_( E const & x, char const * current_function, char const * file, int line )
-        {
-            throw_exception(
-                set_info(
-                    set_info(
-                        set_info(
-                            enable_error_info(x),
-                            throw_function(current_function)),
-                        throw_file(file)),
-                    throw_line(line)));
-        }
-    }
-#endif
-
 #ifdef BOOST_NO_EXCEPTIONS
 
 void throw_exception( std::exception const & e ); // user defined
@@ -86,6 +66,26 @@ template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const
 
 #endif
 
+#if !defined( BOOST_EXCEPTION_DISABLE )
+    namespace
+    exception_detail
+    {
+        template <class E>
+        BOOST_ATTRIBUTE_NORETURN
+        void
+        throw_exception_( E const & x, char const * current_function, char const * file, int line )
+        {
+            boost::throw_exception(
+                set_info(
+                    set_info(
+                        set_info(
+                            enable_error_info(x),
+                            throw_function(current_function)),
+                        throw_file(file)),
+                    throw_line(line)));
+        }
+    }
+#endif
 } // namespace boost
 
 #endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
diff --git a/test/no_exceptions_test.cpp b/test/no_exceptions_test.cpp
index bbabcfc..2609be6 100644
--- a/test/no_exceptions_test.cpp
+++ b/test/no_exceptions_test.cpp
@@ -9,6 +9,7 @@
 #include <boost/exception/info.hpp>
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <stdlib.h>
 
 struct
 my_exception:
@@ -38,6 +39,7 @@ boost
 #ifndef BOOST_NO_RTTI
         BOOST_TEST(s.find("my_tag")!=std::string::npos);
 #endif
+        exit(0);
         }
     }
 
diff --git a/test/refcount_ptr_test.cpp b/test/refcount_ptr_test.cpp
index 773d784..283f570 100644
--- a/test/refcount_ptr_test.cpp
+++ b/test/refcount_ptr_test.cpp
@@ -28,11 +28,16 @@ test_type
         ++count_;
         }
 
-    void
+    bool
     release()
         {
-        if( !--count_ )
+        if( --count_ )
+            return false;
+        else
+            {
             delete this;
+            return true;
+            }
         }
 
     private: