[Boost-commit] svn:boost r48469 - in trunk: boost boost/exception boost/exception/detail libs/exception/doc/source libs/exception/example libs/exception/test

From: emil_at_[hidden]
Date: 2008-08-29 22:57:14

Author: emildotchevski
Date: 2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
New Revision: 48469
URL: http://svn.boost.org/trac/boost/changeset/48469

Log:
decoupled boost/exception/exception.hpp from boost/exception/detail/type_info.hpp
diagnostic_information improvements
documentation update
Removed:
   trunk/boost/exception/detail/get_boost_exception.hpp
Text files modified: 
   trunk/boost/exception/detail/type_info.hpp                |    99 +                                       
   trunk/boost/exception/diagnostic_information.hpp          |    78 +                                       
   trunk/boost/exception/enable_error_info.hpp               |     6                                         
   trunk/boost/exception/exception.hpp                       |    54                                         
   trunk/boost/exception/get_error_info.hpp                  |    17                                         
   trunk/boost/exception/info.hpp                            |    34                                         
   trunk/boost/exception_ptr.hpp                             |    32                                         
   trunk/libs/exception/doc/source/boost-exception.reno      |  2115 +++++++++++++++++++-------------------- 
   trunk/libs/exception/example/example_io.cpp               |     4                                         
   trunk/libs/exception/test/cloning_test.cpp                |     2                                         
   trunk/libs/exception/test/diagnostic_information_test.cpp |    33                                         
   trunk/libs/exception/test/enable_error_info_test.cpp      |    21                                         
   trunk/libs/exception/test/error_info_test.cpp             |    53                                         
   trunk/libs/exception/test/throw_exception_test.cpp        |    23                                         
   14 files changed, 1396 insertions(+), 1175 deletions(-)

Deleted: trunk/boost/exception/detail/get_boost_exception.hpp
==============================================================================
--- trunk/boost/exception/detail/get_boost_exception.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
+++ (empty file)
@@ -1,47 +0,0 @@
-//Copyright (c) 2006-2008 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef UUID_B9A8291074CA11DD94BFC77156D89593
-#define UUID_B9A8291074CA11DD94BFC77156D89593
-
-#include <boost/exception/exception.hpp>
-
-namespace
-boost
-    {
-    namespace
-    exception_detail
-        {
-#ifdef BOOST_NO_RTTI
-        template <class T>
-        exception const *
-        get_boost_exception( T const * )
-            {
-            try
-                {
-                throw;
-                }
-            catch(
-            exception & x )
-                {
-                return &x;
-                }
-            catch(...)
-                {
-                return 0;
-                }
-            }
-#else
-        template <class T>
-        exception const *
-        get_boost_exception( T const * x )
-            {
-            return dynamic_cast<exception const *>(x);
-            }
-#endif
-        }
-    }
-
-#endif

Modified: trunk/boost/exception/detail/type_info.hpp
==============================================================================
--- trunk/boost/exception/detail/type_info.hpp	(original)
+++ trunk/boost/exception/detail/type_info.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -12,10 +12,10 @@
 namespace
 boost
     {
-    template <class ErrorInfoTag>
+    template <class T>
     inline
     char const *
-    error_info_value()
+    type_name()
         {
         return BOOST_CURRENT_FUNCTION;
         }
@@ -23,40 +23,99 @@
     namespace
     exception_detail
         {
-        typedef detail::sp_typeinfo type_info_;
-
 #ifdef BOOST_NO_TYPEID
-        typedef type_info_ type_info_wrapper;
+        struct
+        type_info_
+            {
+            detail::sp_typeinfo type_;
+            char const * name_;
+
+            explicit
+            type_info_( detail::sp_typeinfo type, char const * name ):
+                type_(type),
+                name_(name)
+                {
+                }
+
+            friend
+            bool
+            operator==( type_info_ const & a, type_info_ const & b )
+                {
+                return a.type_==b.type_;
+                }
+
+            friend
+            bool
+            operator!=( type_info_ const & a, type_info_ const & b )
+                {
+                return !(a==b);
+                }
+
+            friend
+            bool
+            operator<( type_info_ const & a, type_info_ const & b )
+                {
+                return a.type_<b.type_;
+                }
+
+            char const *
+            name() const
+                {
+                return name_;
+                }
+            };
 #else
         struct
-        type_info_wrapper
+        type_info_
             {
-            type_info_ const * type;
+            detail::sp_typeinfo const * type_;
 
             explicit
-            type_info_wrapper( type_info_ const & t ):
-                type(&t)
+            type_info_( detail::sp_typeinfo const & type ):
+                type_(&type)
+                {
+                }
+
+            type_info_( detail::sp_typeinfo const & type, char const * ):
+                type_(&type)
+                {
+                }
+
+            friend
+            bool
+            operator==( type_info_ const & a, type_info_ const & b )
+                {
+                return (*a.type_)==(*b.type_);
+                }
+
+            friend
+            bool
+            operator!=( type_info_ const & a, type_info_ const & b )
                 {
+                return !(a==b);
                 }
 
+            friend
             bool
-            operator<( type_info_wrapper const & b ) const
+            operator<( type_info_ const & a, type_info_ const & b )
+                {
+                return 0!=(a.type_->before(*b.type_));
+                }
+
+            char const *
+            name() const
                 {
-                return 0!=(type->before(*b.type));
+                return type_->name();
                 }
             };
 #endif
-
-        template <class ErrorInfoTag>
-        inline
-        char const *
-        type_name()
-            {
-            return error_info_value<ErrorInfoTag>();
-            }
         }
     }
 
-#define BOOST_EXCEPTION_STATIC_TYPEID(T) BOOST_SP_TYPEID(T)
+#define BOOST_EXCEPTION_STATIC_TYPEID(T) ::boost::exception_detail::type_info_(BOOST_SP_TYPEID(T),::boost::type_name<T>())
+
+#ifndef BOOST_NO_RTTI
+#define BOOST_EXCEPTION_DYNAMIC_TYPEID(x) ::boost::exception_detail::type_info_(typeid(x))
+#endif
 
 #endif

Modified: trunk/boost/exception/diagnostic_information.hpp
==============================================================================
--- trunk/boost/exception/diagnostic_information.hpp	(original)
+++ trunk/boost/exception/diagnostic_information.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -6,27 +6,87 @@
 #ifndef UUID_0552D49838DD11DD90146B8956D89593
 #define UUID_0552D49838DD11DD90146B8956D89593
 
-#include <boost/exception/detail/get_boost_exception.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/detail/type_info.hpp>
 #include <exception>
 #include <string>
 
 namespace
 boost
     {
+    namespace
+    exception_detail
+        {
+        template <class T>
+        std::string
+        std_exception_diagnostic_information( std::exception const * x, T const & )
+            {
+            if( char const * s=x->what() )
+                if( *s )
+                    return std::string("std::exception::what(): ")+s;
+            return std::string();
+            }
+
+        template <class T>
+        std::string
+        std_exception_diagnostic_information( void const *, T const & e )
+            {
+#ifndef BOOST_NO_RTTI
+            if( std::exception const * x=dynamic_cast<std::exception const *>(&e) )
+                return std_exception_diagnostic_information(x,e);
+            else
+#endif
+                return std::string();
+            }
+
+        template <class T>
+        std::string
+        boost_exception_diagnostic_information( boost::exception const * x, T const & )
+            {
+            if( char const * s=x->diagnostic_information() )
+                if( *s )
+                    return std::string("boost::exception::diagnostic_information():\n")+s;
+            return std::string();
+            }
+
+        template <class T>
+        std::string
+        boost_exception_diagnostic_information( void const *, T const & e )
+            {
+#ifndef BOOST_NO_RTTI
+            if( exception const * x=dynamic_cast<exception const *>(&e) )
+                return boost_exception_diagnostic_information(x,e);
+            else
+#endif
+                return std::string();
+            }
+        }
+
+    template <class T>
     inline
     std::string
-    diagnostic_information( std::exception const & x )
+    diagnostic_information( T const & x )
         {
-        if( exception const * be = exception_detail::get_boost_exception(&x) )
-            return be->diagnostic_information();
-        else
-            return std::string("[ what: ") + x.what() + ", type: "
+        std::string di=
 #if defined(BOOST_NO_RTTI) || defined(BOOST_NO_TYPEID)
-                "Unknown type deriving from std::exception"
+            std::string("Static exception type: ")+BOOST_EXCEPTION_STATIC_TYPEID(T)
 #else
-                + typeid(x).name() +
+            std::string("Dynamic exception type: ")+BOOST_EXCEPTION_DYNAMIC_TYPEID(x)
 #endif
-                " ]";
+            .name();
+        std::string di1=exception_detail::std_exception_diagnostic_information(&x,x);
+        if( !di1.empty() )
+            {
+            di+='\n';
+            di+=di1;
+            }
+        std::string di2=exception_detail::boost_exception_diagnostic_information(&x,x);
+        if( !di2.empty() )
+            {
+            di+='\n';
+            di+=di2;
+            }
+        return di;
         }
     }
 

Modified: trunk/boost/exception/enable_error_info.hpp
==============================================================================
--- trunk/boost/exception/enable_error_info.hpp	(original)
+++ trunk/boost/exception/enable_error_info.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -32,12 +32,6 @@
             ~error_info_injector() throw()
                 {
                 }
-
-            char const *
-            diagnostic_information() const throw()
-                {
-                return boost::exception::_diagnostic_information(T::what());
-                }
             };
 
         struct large_size { char c[256]; };

Modified: trunk/boost/exception/exception.hpp
==============================================================================
--- trunk/boost/exception/exception.hpp	(original)
+++ trunk/boost/exception/exception.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -6,11 +6,8 @@
 #ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
 #define UUID_274DA366004E11DCB1DDFE2E56D89593
 
-#include <boost/exception/detail/type_info.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/exception/detail/counted_base.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <typeinfo>
 
 namespace
 boost
@@ -24,12 +21,13 @@
     exception_detail
         {
         class error_info_base;
+        struct type_info_;
 
         struct
         error_info_container:
             public exception_detail::counted_base
             {
-            virtual char const * diagnostic_information( char const *, char const * ) const = 0;
+            virtual char const * diagnostic_information() const = 0;
             virtual shared_ptr<error_info_base const> get( type_info_ const & ) const = 0;
             virtual void set( shared_ptr<error_info_base const> const &, type_info_ const & ) = 0;
             };
@@ -37,7 +35,7 @@
         template <class ErrorInfo>
         shared_ptr<typename ErrorInfo::value_type const> get_data( exception const & );
 
-        void set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & );
+        void set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, type_info_ const & );
         }
 
     class
@@ -49,7 +47,7 @@
         char const *
         diagnostic_information() const throw()
             {
-            return _diagnostic_information(0);
+            return _diagnostic_information();
             }
 
         protected:
@@ -63,22 +61,6 @@
             {
             }
 
-        char const *
-        _diagnostic_information( char const * std_what ) const throw()
-            {
-            if( data_ )
-                try
-                    {
-                    char const * w = data_->diagnostic_information(std_what,dynamic_type_name());
-                    BOOST_ASSERT(w!=0);
-                    return w;
-                    }
-                catch(...)
-                    {
-                    }
-            return std_what ? std_what : dynamic_type_name();
-            }
-
 #if BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1500) )
         //Force class exception to be abstract.
         //Otherwise, MSVC bug allows throw exception(), even though the copy constructor is protected.
@@ -92,6 +74,22 @@
             }
 #endif
 
+        char const *
+        _diagnostic_information() const throw()
+            {
+            if( data_ )
+                try
+                    {
+                    char const * w = data_->diagnostic_information();
+                    BOOST_ASSERT(w!=0);
+                    return w;
+                    }
+                catch(...)
+                    {
+                    }
+            return "";
+            }
+
         private:
 
         friend void exception_detail::set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & );
@@ -99,18 +97,6 @@
         template <class ErrorInfo>
         friend shared_ptr<typename ErrorInfo::value_type const> exception_detail::get_data( exception const & );
 
-        char const *
-        dynamic_type_name() const
-            {
-            return
-#if defined(BOOST_NO_RTTI) || defined(BOOST_NO_TYPEID)
-                "Unknown type deriving from boost::exception"
-#else
-                typeid(*this).name()
-#endif
-                ;
-            }
-
         mutable intrusive_ptr<exception_detail::error_info_container> data_;
         };
 

Modified: trunk/boost/exception/get_error_info.hpp
==============================================================================
--- trunk/boost/exception/get_error_info.hpp	(original)
+++ trunk/boost/exception/get_error_info.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -6,9 +6,10 @@
 #ifndef UUID_1A590226753311DD9E4CCF6156D89593
 #define UUID_1A590226753311DD9E4CCF6156D89593
 
-#include <boost/shared_ptr.hpp>
-#include <boost/exception/detail/get_boost_exception.hpp>
+#include <boost/exception/exception.hpp>
 #include <boost/exception/detail/error_info_base.hpp>
+#include <boost/exception/detail/type_info.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace
 boost
@@ -34,16 +35,26 @@
             }
         }
 
+#ifdef BOOST_NO_RTTI
+    template <class ErrorInfo>
+    inline
+    shared_ptr<typename ErrorInfo::value_type const>
+    get_error_info( boost::exception const & x )
+        {
+        return exception_detail::get_data<ErrorInfo>(x);
+        }
+#else
     template <class ErrorInfo,class E>
     inline
     shared_ptr<typename ErrorInfo::value_type const>
     get_error_info( E const & some_exception )
         {
-        if( exception const * x = exception_detail::get_boost_exception(&some_exception) )
+        if( exception const * x = dynamic_cast<exception const *>(&some_exception) )
             return exception_detail::get_data<ErrorInfo>(*x);
         else
             return shared_ptr<typename ErrorInfo::value_type const>();
         }
+#endif
     }
 
 #endif

Modified: trunk/boost/exception/info.hpp
==============================================================================
--- trunk/boost/exception/info.hpp	(original)
+++ trunk/boost/exception/info.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -7,9 +7,10 @@
 #define UUID_8D22C4CA9CC811DCAA9133D256D89593
 
 #include <boost/exception/exception.hpp>
-#include <boost/exception/detail/error_info_base.hpp>
 #include <boost/exception/error_info.hpp>
 #include <boost/exception/to_string_stub.hpp>
+#include <boost/exception/detail/error_info_base.hpp>
+#include <boost/exception/detail/type_info.hpp>
 #include <boost/shared_ptr.hpp>
 #include <map>
 
@@ -50,7 +51,7 @@
         char const *
         tag_typeid_name() const
             {
-            return exception_detail::type_name<Tag>();
+            return type_name<Tag>();
             }
 
         std::string
@@ -84,19 +85,19 @@
             set( shared_ptr<error_info_base const> const & x, type_info_ const & typeid_ )
                 {
                 BOOST_ASSERT(x);
-                info_[type_info_wrapper(typeid_)] = x;
-                what_.clear();
+                info_[typeid_] = x;
+                diagnostic_info_str_.clear();
                 }
 
             shared_ptr<error_info_base const>
             get( type_info_ const & ti ) const
                 {
-                error_info_map::const_iterator i=info_.find(type_info_wrapper(ti));
+                error_info_map::const_iterator i=info_.find(ti);
                 if( info_.end()!=i )
                     {
                     shared_ptr<error_info_base const> const & p = i->second;
 #ifndef BOOST_NO_RTTI
-                    BOOST_ASSERT( typeid(*p)==ti );
+                    BOOST_ASSERT( BOOST_EXCEPTION_DYNAMIC_TYPEID(*p)==ti );
 #endif
                     return p;
                     }
@@ -104,20 +105,11 @@
                 }
 
             char const *
-            diagnostic_information( char const * std_what, char const * exception_type_name ) const
+            diagnostic_information() const
                 {
-                BOOST_ASSERT(exception_type_name!=0 && *exception_type_name );
-                if( what_.empty() )
+                if( diagnostic_info_str_.empty() )
                     {
                     std::string tmp;
-                    if( std_what )
-                        {
-                        tmp += std_what;
-                        tmp += '\n';
-                        }
-                    tmp += "Dynamic exception type: ";
-                    tmp += exception_type_name;
-                    tmp += '\n';
                     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;
@@ -127,18 +119,18 @@
                         tmp += x->value_as_string();
                         tmp += '\n';
                         }
-                    what_.swap(tmp);
+                    diagnostic_info_str_.swap(tmp);
                     }
-                return what_.c_str();
+                return diagnostic_info_str_.c_str();
                 }
 
             private:
 
             friend class exception;
 
-            typedef std::map< type_info_wrapper, shared_ptr<error_info_base const> > error_info_map;
+            typedef std::map< type_info_, shared_ptr<error_info_base const> > error_info_map;
             error_info_map info_;
-            mutable std::string what_;
+            mutable std::string diagnostic_info_str_;
             mutable int count_;
 
             void

Modified: trunk/boost/exception_ptr.hpp
==============================================================================
--- trunk/boost/exception_ptr.hpp	(original)
+++ trunk/boost/exception_ptr.hpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -6,8 +6,8 @@
 #ifndef UUID_FA5836A2CADA11DC8CD47C8555D89593
 #define UUID_FA5836A2CADA11DC8CD47C8555D89593
 
-#include <boost/exception/detail/get_boost_exception.hpp>
 #include <boost/exception/enable_current_exception.hpp>
+#include <boost/exception/detail/type_info.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include <stdexcept>
 #include <new>
@@ -257,6 +257,34 @@
                 }
             };
 
+#ifdef BOOST_NO_RTTI
+        template <class T>
+        exception const *
+        get_boost_exception( T const * )
+            {
+            try
+                {
+                throw;
+                }
+            catch(
+            exception & x )
+                {
+                return &x;
+                }
+            catch(...)
+                {
+                return 0;
+                }
+            }
+#else
+        template <class T>
+        exception const *
+        get_boost_exception( T const * x )
+            {
+            return dynamic_cast<exception const *>(x);
+            }
+#endif
+
         template <class T>
         inline
         exception_ptr
@@ -340,6 +368,7 @@
                 {
                 return exception_detail::current_exception_std_exception(e);
                 }
+#ifndef BOOST_NO_TYPEID
             catch(
             std::bad_cast & e )
                 {
@@ -350,6 +379,7 @@
                 {
                 return exception_detail::current_exception_std_exception(e);
                 }
+#endif
             catch(
             std::bad_exception & e )
                 {

Modified: trunk/libs/exception/doc/source/boost-exception.reno
==============================================================================
--- trunk/libs/exception/doc/source/boost-exception.reno	(original)
+++ trunk/libs/exception/doc/source/boost-exception.reno	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -54,14 +54,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-																			<weak>737034355</weak>
-																			<size>10349</size>
-																			<position>521</position>
+																			<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+																			<weak>2089604779</weak>
+																			<size>11016</size>
+																			<position>511</position>
                                                                                                                                                         <strong>4B6ED02EA5B5A3B326838794C37ED01C5DC3E8D89FA78E62B9F7A0C78D4DB6FD</strong>
                                                                                                                                                         <weak>2715164371</weak>
                                                                                                                                                         <size>116</size>
-																			<position>10227</position>
+																			<position>10894</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -103,14 +103,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>AE3A2E2D2C5F64EF089B5E3B27F1D42E1D0FD99D0CF898C7D5F828D4401090DB</strong>
-																			<weak>2880991434</weak>
-																			<size>1268</size>
-																			<position>472</position>
-																			<strong>40062E1E97460C1E0AB685CE189F5D6607389A5A533C9E7D28050B4037EE3A50</strong>
-																			<weak>4283132066</weak>
-																			<size>1236</size>
-																			<position>26</position>
+																			<strong>F126A8CB9244BC9DE8BD1D89B47453028CEC694D7EF40BB4474018FA6F056E4C</strong>
+																			<weak>3161833426</weak>
+																			<size>1527</size>
+																			<position>504</position>
+																			<strong>8E724ECF48FB144FBAC1B7F27AE077812CDA75F1A05A08F951DD7F9D54863425</strong>
+																			<weak>4144026351</weak>
+																			<size>676</size>
+																			<position>845</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -151,15 +151,58 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
+																			<size>1</size>
+																			<strong>5373E336DC4892A41D31694BCA1146382FC3137819A04689CA1F9FFAF1CFAB3B</strong>
+																			<weak>4050491732</weak>
+																			<size>466</size>
+																			<position>307</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../example/cloning_1.cpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>using enable_current_exception at the time of the throw</string>
+															</title>
+															<file_name>
+																<string>using_enable_cloning</string>
+															</file_name>
+														</object>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>8</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
                                                                                                                                                         <size>2</size>
-																			<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-																			<weak>737034355</weak>
-																			<size>10349</size>
-																			<position>521</position>
+																			<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+																			<weak>2089604779</weak>
+																			<size>11016</size>
+																			<position>511</position>
                                                                                                                                                         <strong>F87D7E0321BDDAE23D5A6667CB12116411468AEC54E3B35FB9C8CA94BFECA41E</strong>
                                                                                                                                                         <weak>1149388739</weak>
                                                                                                                                                         <size>296</size>
-																			<position>9929</position>
+																			<position>10596</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -191,7 +234,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>8</id>
+														<id>9</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -201,10 +244,10 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-																			<weak>737034355</weak>
-																			<size>10349</size>
-																			<position>521</position>
+																			<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+																			<weak>2089604779</weak>
+																			<size>11016</size>
+																			<position>511</position>
                                                                                                                                                         <strong>C84057F7B3954843F5360E9764B35DC5EB1D8ED65CA9F1B6B633D95B417E3AA9</strong>
                                                                                                                                                         <weak>1591300832</weak>
                                                                                                                                                         <size>2322</size>
@@ -240,7 +283,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>9</id>
+														<id>10</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -250,13 +293,13 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>3EFECC50102590C4E9074D4F86B0E8F831D933193CCF70B8D80E8A0CF345C150</strong>
-																			<weak>877841526</weak>
-																			<size>4772</size>
-																			<position>726</position>
-																			<strong>82BA37021947A2C641B3285537EB8841A6AC59067CE01D873BC19725BAADCFC1</strong>
-																			<weak>1244314370</weak>
-																			<size>733</size>
+																			<strong>353C90D92FFBB5A5616E5A9FAA19868B8234159FB714A1631B4E415B941DC9D3</strong>
+																			<weak>3466161861</weak>
+																			<size>4362</size>
+																			<position>775</position>
+																			<strong>CF9032A2CB14D66F0F004C0AFDE2BB94321F405D6D95AC46EC5350AB4843A4F1</strong>
+																			<weak>1073329133</weak>
+																			<size>715</size>
                                                                                                                                                         <position>243</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -289,7 +332,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>10</id>
+														<id>11</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -334,7 +377,52 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>11</id>
+														<id>12</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>1</size>
+																			<strong>CAB4D823BD4720B71E1CA5BE482AC95B42A9E07CD5E08671EA23184635F281A2</strong>
+																			<weak>3077708282</weak>
+																			<size>89</size>
+																			<position>323</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../../../boost/exception/error_info.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>boost/exception/error_info.hpp</string>
+															</title>
+															<file_name>
+																<string>exception_error_info_value_hpp</string>
+															</file_name>
+														</object>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>13</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -372,7 +460,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>12</id>
+														<id>14</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -382,9 +470,9 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>DA91A64CCC9A5B149DFB580E5466539607C9CE92A93F56CE4C03996A468C1145</strong>
-																			<weak>2002159572</weak>
-																			<size>10547</size>
+																			<strong>EE6990C848AF26755A4A3D327073CC8122B3D2C0D00DA2B0F33E4D8805ACB911</strong>
+																			<weak>465181157</weak>
+																			<size>11204</size>
                                                                                                                                                         <position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -417,7 +505,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>13</id>
+														<id>15</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -427,14 +515,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>3EFECC50102590C4E9074D4F86B0E8F831D933193CCF70B8D80E8A0CF345C150</strong>
-																			<weak>877841526</weak>
-																			<size>4772</size>
-																			<position>726</position>
+																			<strong>353C90D92FFBB5A5616E5A9FAA19868B8234159FB714A1631B4E415B941DC9D3</strong>
+																			<weak>3466161861</weak>
+																			<size>4362</size>
+																			<position>775</position>
                                                                                                                                                         <strong>C552A651ADC0B9506373CC1A78CB4D7D0342BC99BD24F2F2B8CAD3B555037FE7</strong>
                                                                                                                                                         <weak>141521629</weak>
                                                                                                                                                         <size>382</size>
-																			<position>4384</position>
+																			<position>3974</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -466,7 +554,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>14</id>
+														<id>16</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -476,9 +564,9 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>0C00BEB179039380247D771B12C728884E9A3E5B483AC63CD5789852C7A5CC35</strong>
-																			<weak>2506662970</weak>
-																			<size>2467</size>
+																			<strong>ABA5BB25BAD31B070056FA9595F73F6F0E7F2A1D36D8A2ECDEBE6A2872E0E966</strong>
+																			<weak>980578466</weak>
+																			<size>2271</size>
                                                                                                                                                         <position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -511,7 +599,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>15</id>
+														<id>17</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -556,7 +644,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>16</id>
+														<id>18</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -601,7 +689,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>17</id>
+														<id>19</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -611,9 +699,9 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>3999B09B03466CF6F624CB20689AE32FEFBAF81B2ADDA4D0E6777BC052B1BE70</strong>
-																			<weak>2497361403</weak>
-																			<size>3349</size>
+																			<strong>3D62495D55F856D594F8BCFD89F283A1B55638AE7B7609C8EFE4A84371EF6867</strong>
+																			<weak>1383536793</weak>
+																			<size>2830</size>
                                                                                                                                                         <position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -646,7 +734,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>18</id>
+														<id>20</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -689,7 +777,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>19</id>
+														<id>21</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -699,14 +787,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-																			<weak>1525247529</weak>
-																			<size>3149</size>
-																			<position>523</position>
-																			<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-																			<weak>1676293364</weak>
-																			<size>2098</size>
-																			<position>886</position>
+																			<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+																			<weak>3608148048</weak>
+																			<size>2740</size>
+																			<position>413</position>
+																			<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+																			<weak>1650706135</weak>
+																			<size>1707</size>
+																			<position>868</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -738,7 +826,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>20</id>
+														<id>22</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -751,7 +839,7 @@
                                                                                                                                                         <strong>49D31376D97691F7C84A134B5D8C7C66EF1ED6901D376CA250D634AE2B38AB5E</strong>
                                                                                                                                                         <weak>549270010</weak>
                                                                                                                                                         <size>163</size>
-																			<position>561</position>
+																			<position>610</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -783,7 +871,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>21</id>
+														<id>23</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -826,50 +914,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>22</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>5373E336DC4892A41D31694BCA1146382FC3137819A04689CA1F9FFAF1CFAB3B</strong>
-																			<weak>4050491732</weak>
-																			<size>466</size>
-																			<position>307</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../example/cloning_1.cpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>using enable_current_exception at the time of the throw</string>
-															</title>
-															<file_name>
-																<string>using_enable_cloning</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>23</id>
+														<id>24</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -879,27 +924,27 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>CAB4D823BD4720B71E1CA5BE482AC95B42A9E07CD5E08671EA23184635F281A2</strong>
-																			<weak>3077708282</weak>
-																			<size>89</size>
-																			<position>323</position>
+																			<strong>CAD6C404CB725D336A44920D2341ECA131149AB02C368B59028F8147F16737BF</strong>
+																			<weak>2258638601</weak>
+																			<size>94</size>
+																			<position>227</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/error_info.hpp</string>
+																		<string>../../../../boost/exception/info_tuple.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/error_info.hpp</string>
+																<string>boost/exception/info_tuple.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_error_info_value_hpp</string>
+																<string>exception_error_info_group_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -914,7 +959,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>24</id>
+														<id>25</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -924,18 +969,18 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>3</size>
-																			<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-																			<weak>1525247529</weak>
-																			<size>3149</size>
-																			<position>523</position>
-																			<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-																			<weak>1676293364</weak>
-																			<size>2098</size>
-																			<position>886</position>
+																			<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+																			<weak>3608148048</weak>
+																			<size>2740</size>
+																			<position>413</position>
+																			<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+																			<weak>1650706135</weak>
+																			<size>1707</size>
+																			<position>868</position>
                                                                                                                                                         <strong>BACD79DFB4C710C1A67687FC6344DF2251E2379613C2DF5B2729B2CD37E24EA3</strong>
                                                                                                                                                         <weak>458367129</weak>
                                                                                                                                                         <size>154</size>
-																			<position>246</position>
+																			<position>245</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -967,7 +1012,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>25</id>
+														<id>26</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -977,9 +1022,9 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>A0BB65AB464BCD75627D942684603207867D3C5D1BAE93902A812A07677B596F</strong>
-																			<weak>3668753278</weak>
-																			<size>646</size>
+																			<strong>FED4CEA991FBBA8DF26B5652CE68C929C38BEE74DFD6C8E89E2A623BF0A61503</strong>
+																			<weak>1244906377</weak>
+																			<size>2548</size>
                                                                                                                                                         <position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -1012,7 +1057,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>26</id>
+														<id>27</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1057,7 +1102,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>27</id>
+														<id>28</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1067,9 +1112,9 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>8DF6E9F9346E2A1297844433695E2BAE1AD14FBDB6D943D81B87200FB9F9AE66</strong>
-																			<weak>4241576983</weak>
-																			<size>5175</size>
+																			<strong>0E1089A09F6986E4D1393EC178D2F0A5CA5CAFCF9D2F4B96AEACA14E95ED2B38</strong>
+																			<weak>717228119</weak>
+																			<size>4814</size>
                                                                                                                                                         <position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -1102,7 +1147,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>28</id>
+														<id>29</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1151,7 +1196,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>29</id>
+														<id>30</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1161,14 +1206,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-																			<weak>737034355</weak>
-																			<size>10349</size>
-																			<position>521</position>
-																			<strong>8A536C83AAA6BF19C2B173BE32022C6363004D5F0B88F7982711F5D66F539FE9</strong>
-																			<weak>3888149824</weak>
-																			<size>2495</size>
-																			<position>7432</position>
+																			<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+																			<weak>2089604779</weak>
+																			<size>11016</size>
+																			<position>511</position>
+																			<strong>7890935423C731BD8E7DE2820DF7E85C72126B2EAB9A45B0AAFA5749DD1A9D57</strong>
+																			<weak>2497085175</weak>
+																			<size>2528</size>
+																			<position>8066</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -1200,7 +1245,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>30</id>
+														<id>31</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1210,17 +1255,17 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>3</size>
-																			<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-																			<weak>1525247529</weak>
-																			<size>3149</size>
-																			<position>523</position>
-																			<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-																			<weak>1676293364</weak>
-																			<size>2098</size>
-																			<position>886</position>
-																			<strong>BAC52AC87CFA3174B3352140A8DC10BB7F48C945FC87787C3AC96F0FC2CFDB40</strong>
-																			<weak>1066412964</weak>
-																			<size>165</size>
+																			<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+																			<weak>3608148048</weak>
+																			<size>2740</size>
+																			<position>413</position>
+																			<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+																			<weak>1650706135</weak>
+																			<size>1707</size>
+																			<position>868</position>
+																			<strong>9043738F71C025266AC2C0A2BEDC9DA3579175BE5BA672E59D136559D4269190</strong>
+																			<weak>317401972</weak>
+																			<size>164</size>
                                                                                                                                                         <position>57</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -1253,7 +1298,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>31</id>
+														<id>32</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1263,14 +1308,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>0C9E5FE5B32FD3F31875CF6AD87A485CACC42754EE56F0E72D9D9749734959D5</strong>
-																			<weak>2969409401</weak>
-																			<size>544</size>
-																			<position>425</position>
-																			<strong>1DE66DC4BD5E2E323BA4281B4BAB063AF5E9F7E4A5FE32BA3C0686A844FBA86E</strong>
-																			<weak>4200042321</weak>
-																			<size>512</size>
-																			<position>26</position>
+																			<strong>214D17B425C1C447F952970DA6B1A778AD45CCA513405EB2DA6EBE87285A852A</strong>
+																			<weak>1906283610</weak>
+																			<size>2414</size>
+																			<position>457</position>
+																			<strong>6B355BB18EB534B5221822257C7A7F834692C7256E5D118F5443C7D905731578</strong>
+																			<weak>1509743294</weak>
+																			<size>810</size>
+																			<position>1598</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -1302,7 +1347,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>32</id>
+														<id>33</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1312,18 +1357,18 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>4</size>
-																			<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-																			<weak>1525247529</weak>
-																			<size>3149</size>
-																			<position>523</position>
-																			<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-																			<weak>1676293364</weak>
-																			<size>2098</size>
-																			<position>886</position>
+																			<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+																			<weak>3608148048</weak>
+																			<size>2740</size>
+																			<position>413</position>
+																			<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+																			<weak>1650706135</weak>
+																			<size>1707</size>
+																			<position>868</position>
                                                                                                                                                         <strong>85EE1980CFB24E054EDB1B3BDFA61FD4D65AD0EF248A1A42D4C2552700459327</strong>
                                                                                                                                                         <weak>2238151539</weak>
                                                                                                                                                         <size>428</size>
-																			<position>928</position>
+																			<position>401</position>
                                                                                                                                                         <strong>AD3F339F7126003907BCBDB3EF846FCACA895132E1100D202DA67D2B7846EE65</strong>
                                                                                                                                                         <weak>3032091776</weak>
                                                                                                                                                         <size>60</size>
@@ -1359,7 +1404,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>33</id>
+														<id>34</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1402,7 +1447,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>34</id>
+														<id>35</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1445,51 +1490,6 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>35</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>CAD6C404CB725D336A44920D2341ECA131149AB02C368B59028F8147F16737BF</strong>
-																			<weak>2258638601</weak>
-																			<size>94</size>
-																			<position>227</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception/info_tuple.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>boost/exception/info_tuple.hpp</string>
-															</title>
-															<file_name>
-																<string>exception_error_info_group_hpp</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
                                                                                                                 <id>36</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
@@ -1545,10 +1545,10 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-																			<weak>737034355</weak>
-																			<size>10349</size>
-																			<position>521</position>
+																			<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+																			<weak>2089604779</weak>
+																			<size>11016</size>
+																			<position>511</position>
                                                                                                                                                         <strong>CCBCB5EADA66B82DFC7650F467A0E51CA5B10EFCD3729EDFB038A1C5DCB5722D</strong>
                                                                                                                                                         <weak>1007135774</weak>
                                                                                                                                                         <size>701</size>
@@ -1681,14 +1681,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>7ACC4E316D4EDB3EC7AEC35FED3ADB47DDF75D575028D7BCD11C5233E4F4A277</strong>
-																			<weak>4268848542</weak>
-																			<size>2333</size>
+																			<strong>040AF162DE93F61F89B118788A02CEA76E19F2F9D66E8FC4D4F0B66C6C4CDCA6</strong>
+																			<weak>1391149574</weak>
+																			<size>2137</size>
                                                                                                                                                         <position>457</position>
-																			<strong>61DE70107961C0B9A65674017F91FF85190CF84B4F3B0CA7AC04A7E16DE80B37</strong>
-																			<weak>3187961206</weak>
-																			<size>2301</size>
-																			<position>26</position>
+																			<strong>B752D5E37E6F1F71AD491E0DEF2C7D7C3ED4C9E78F01443EC408B751C83D521F</strong>
+																			<weak>2684451358</weak>
+																			<size>412</size>
+																			<position>1719</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -1848,7 +1848,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-13</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1857,7 +1857,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1875,7 +1875,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-17</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1884,7 +1884,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1893,7 +1893,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1902,7 +1902,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1911,7 +1911,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-28</id>
+															<id>-29</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1938,7 +1938,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-20</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1947,7 +1947,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1965,7 +1965,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1974,7 +1974,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-8</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2001,7 +2001,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-32</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2019,7 +2019,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2028,7 +2028,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-26</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2037,7 +2037,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2046,7 +2046,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-16</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2055,7 +2055,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-12</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2064,7 +2064,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2083,9 +2083,9 @@
                                                                                                                                                 <stream_hook_path>
                                                                                                                                                         <container>
                                                                                                                                                                 <size>1</size>
-																				<strong>86DE119A4A3E9251475D1291AF99B769E304A8E0172409FC2A4E02B8D4BF73A2</strong>
-																				<weak>767141628</weak>
-																				<size>1417</size>
+																				<strong>E6CCBC6F6FEAEF1E95E23AFC7A7268DB35549B5951BE08BC7B4429B7490195ED</strong>
+																				<weak>1344405806</weak>
+																				<size>1708</size>
                                                                                                                                                                 <position>323</position>
                                                                                                                                                         </container>
                                                                                                                                                 </stream_hook_path>
@@ -2114,7 +2114,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2123,7 +2123,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2132,7 +2132,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2159,7 +2159,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2168,7 +2168,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2177,7 +2177,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2186,7 +2186,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2195,7 +2195,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-16</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2204,7 +2204,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-26</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2213,7 +2213,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2222,7 +2222,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2240,7 +2240,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2249,7 +2249,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2258,7 +2258,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2267,7 +2267,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-28</id>
+															<id>-29</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2294,7 +2294,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-20</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2303,7 +2303,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2321,7 +2321,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2330,7 +2330,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-8</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2357,7 +2357,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-32</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2465,6 +2465,17 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-10</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@template &lt;class Tag,class T&gt;&#10;class&#10;(:link </string>
@@ -2472,7 +2483,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2483,7 +2494,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-10</id>
+														<id>-11</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2494,7 +2505,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-11</id>
+														<id>-12</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2505,7 +2516,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-12</id>
+														<id>-13</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2516,7 +2527,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-13</id>
+														<id>-14</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2527,7 +2538,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-15</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2538,7 +2549,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-15</id>
+														<id>-16</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2549,7 +2560,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-16</id>
+														<id>-17</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2560,7 +2571,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-17</id>
+														<id>-18</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2571,7 +2582,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-18</id>
+														<id>-19</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2582,7 +2593,18 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-19</id>
+														<id>-20</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-21</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2593,7 +2615,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2602,7 +2624,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2611,7 +2633,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>-25</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2620,7 +2642,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-32</id>
+															<id>-33</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2631,28 +2653,6 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
                                                                                                                 <id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
@@ -2979,6 +2979,17 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-11</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@(:include </string>
@@ -2997,7 +3008,29 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-11</id>
+														<id>-12</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-10</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-13</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3008,7 +3041,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-12</id>
+														<id>-14</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3028,7 +3061,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3037,7 +3070,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-8</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3046,7 +3079,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3066,7 +3099,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-13</id>
+														<id>-15</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3077,7 +3110,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-16</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3099,7 +3132,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-15</id>
+														<id>-17</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3110,7 +3143,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-16</id>
+														<id>-18</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3121,7 +3154,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-26</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3130,7 +3163,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3139,7 +3172,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-16</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3148,7 +3181,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-12</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3157,7 +3190,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3175,7 +3208,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3184,7 +3217,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3193,7 +3226,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3213,7 +3246,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-17</id>
+														<id>-19</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3224,7 +3257,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3235,18 +3268,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-18</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-19</id>
+														<id>-20</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3257,7 +3279,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
+														<id>-21</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3268,7 +3290,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-21</id>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3279,7 +3301,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-22</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3290,7 +3312,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-23</id>
+														<id>-24</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3301,7 +3323,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-29</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3312,7 +3334,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
+														<id>-25</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3323,7 +3345,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-25</id>
+														<id>-26</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3334,7 +3356,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-32</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3345,7 +3367,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-26</id>
+														<id>-27</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3356,7 +3378,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-27</id>
+														<id>-28</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3367,7 +3389,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3376,7 +3398,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-20</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3385,7 +3407,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3396,7 +3418,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3407,7 +3429,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-30</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3418,18 +3440,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-30</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-31</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3477,18 +3488,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -3650,7 +3650,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3687,6 +3687,17 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-8</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
                                                                                                         <size>5</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@template &lt;class T&gt;&#10;(:link </string>
@@ -3694,7 +3705,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3703,7 +3714,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-8</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3714,7 +3725,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-8</id>
+														<id>-9</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3725,7 +3736,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3736,7 +3747,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-9</id>
+														<id>-10</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3747,7 +3758,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3758,7 +3769,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-10</id>
+														<id>-11</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3769,7 +3780,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-11</id>
+														<id>-12</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3780,7 +3791,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-12</id>
+														<id>-13</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3791,7 +3802,18 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-13</id>
+														<id>-14</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-15</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3802,7 +3824,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3811,7 +3833,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3822,7 +3844,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-16</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3833,7 +3855,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-15</id>
+														<id>-17</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3844,7 +3866,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-16</id>
+														<id>-18</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3855,7 +3877,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-17</id>
+														<id>-19</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3866,7 +3888,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-18</id>
+														<id>-20</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3877,7 +3899,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-19</id>
+														<id>-21</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3888,7 +3910,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3899,7 +3921,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3910,7 +3932,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3919,7 +3941,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3928,7 +3950,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3937,7 +3959,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-20</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3948,18 +3970,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-22</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3970,7 +3981,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-23</id>
+														<id>-24</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3981,7 +3992,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
+														<id>-25</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3992,7 +4003,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>-25</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4001,7 +4012,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>-25</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4010,7 +4021,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4021,7 +4032,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-25</id>
+														<id>-26</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4032,7 +4043,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-26</id>
+														<id>-27</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4043,7 +4054,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-27</id>
+														<id>-28</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4054,7 +4065,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4065,7 +4076,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-28</id>
+															<id>-29</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4074,7 +4085,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4083,7 +4094,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4094,7 +4105,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-30</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4105,7 +4116,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4114,7 +4125,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4125,7 +4136,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-30</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4136,7 +4147,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4147,29 +4158,29 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-31</id>
+														<id>-32</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@std::string </string>
+													<string>[@template &lt;class T&gt;&#10;std::string (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-32</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>( std::exception const &amp; x );@]&#10;</string>
+													<string>:)( T const &amp; x );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-32</id>
+														<id>-33</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4180,7 +4191,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-32</id>
+															<id>-33</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4191,17 +4202,6 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
                                                                                                                 <id>-34</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
@@ -4255,7 +4255,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4423,7 +4423,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4441,7 +4441,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4450,7 +4450,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4465,6 +4465,73 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
+													<size>13</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;Here is how cloning can be enabled in a throw-expression (15.1):&#10;&#10;[@#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-11</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-28</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::error_info&lt;struct tag_errno,int&gt; errno_info;&#10;&#10;class file_read_error: public boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-21</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) { };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)(file_read_error()) &lt;&lt;&#10;            errno_info(errno);&#10;    }@]&#10;&#10;Of course, (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) may be used with any exception type; there is no requirement that it should derive from boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-21</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:).&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-8</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if try { throw e; } catch( ... ) { return (:link </string>
@@ -4472,7 +4539,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4483,7 +4550,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-8</id>
+														<id>-9</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4494,7 +4561,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4503,7 +4570,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4512,7 +4579,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4521,7 +4588,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4532,7 +4599,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-9</id>
+														<id>-10</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4543,7 +4610,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4552,7 +4619,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4561,7 +4628,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4570,7 +4637,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-12</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4579,7 +4646,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4588,7 +4655,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-12</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4597,7 +4664,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4606,7 +4673,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4615,7 +4682,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4624,7 +4691,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4642,7 +4709,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4653,7 +4720,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-10</id>
+														<id>-11</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4666,7 +4733,20 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-11</id>
+														<id>-12</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-13</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4677,7 +4757,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4686,7 +4766,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4695,7 +4775,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-34</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4704,7 +4784,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-18</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4713,7 +4793,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-21</id>
+															<id>-23</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4724,7 +4804,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-12</id>
+														<id>-14</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4737,7 +4817,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-13</id>
+														<id>-15</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4748,7 +4828,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4757,7 +4837,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4766,7 +4846,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4777,7 +4857,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-16</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4790,7 +4870,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-15</id>
+														<id>-17</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4801,7 +4881,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4810,7 +4890,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4819,7 +4899,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4828,7 +4908,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4837,7 +4917,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4846,7 +4926,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4855,7 +4935,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4864,7 +4944,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4873,7 +4953,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4882,7 +4962,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4893,7 +4973,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-16</id>
+														<id>-18</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4906,7 +4986,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-17</id>
+														<id>-19</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4919,7 +4999,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-18</id>
+														<id>-20</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4930,7 +5010,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4939,7 +5019,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4948,7 +5028,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4957,7 +5037,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4966,7 +5046,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4975,7 +5055,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4984,7 +5064,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4993,7 +5073,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5002,7 +5082,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5022,7 +5102,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-19</id>
+														<id>-21</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5033,7 +5113,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5042,7 +5122,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5051,7 +5131,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5060,7 +5140,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5069,7 +5149,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5087,7 +5167,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>-25</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5096,7 +5176,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-32</id>
+															<id>-33</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5105,7 +5185,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5116,7 +5196,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5127,7 +5207,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5136,7 +5216,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5145,7 +5225,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5156,7 +5236,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-21</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5167,7 +5247,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5176,7 +5256,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5185,7 +5265,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5194,7 +5274,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5203,7 +5283,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5223,74 +5303,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-22</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>13</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;Here is how cloning can be enabled in a throw-expression (15.1):&#10;&#10;[@#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-10</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::error_info&lt;struct tag_errno,int&gt; errno_info;&#10;&#10;class file_read_error: public boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) { };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)(file_read_error()) &lt;&lt;&#10;            errno_info(errno);&#10;    }@]&#10;&#10;Of course, (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) may be used with any exception type; there is no requirement that it should derive from boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:).&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-23</id>
+														<id>-24</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5303,7 +5316,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
+														<id>-25</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5314,7 +5327,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5323,7 +5336,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5332,7 +5345,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5343,7 +5356,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-25</id>
+														<id>-26</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5356,7 +5369,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-26</id>
+														<id>-27</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5367,7 +5380,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5385,7 +5398,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5394,7 +5407,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5403,7 +5416,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5412,7 +5425,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5421,7 +5434,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5448,7 +5461,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5457,7 +5470,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5466,7 +5479,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5475,7 +5488,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-13</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5486,7 +5499,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-27</id>
+														<id>-28</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5499,7 +5512,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5510,7 +5523,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5519,7 +5532,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5530,7 +5543,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-30</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5541,7 +5554,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5550,7 +5563,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5559,7 +5572,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5568,7 +5581,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5577,7 +5590,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5604,7 +5617,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5613,7 +5626,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5631,7 +5644,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5640,7 +5653,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5658,7 +5671,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5669,7 +5682,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-30</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5680,7 +5693,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5689,7 +5702,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5698,7 +5711,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-17</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5707,7 +5720,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-26</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5716,7 +5729,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-32</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5725,7 +5738,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5734,7 +5747,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5745,47 +5758,38 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-31</id>
+														<id>-32</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;The </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-31</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>5</size>
                                                                                                         <variant>2</variant>
-													<string> function must not be called outside of a catch block.&#10;&#10;!!!!Returns:&#10;&#10;If dynamic_cast&lt;boost::(:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;Platform-specific diagnostic information about x.&#10;&#10;!!!!Note:&#10;&#10;If dynamic_cast&lt;boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) const *&gt;(&amp;x) is not null, the returned string is initialized by a call to (:link </string>
+													<string>:) const *&gt;(&amp;x) is not null, the returned string includes the output from (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:); otherwise, the returned string combines the output of x.what() and typeid(x).name().&#10;</string>
+													<string>:).&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-32</id>
+														<id>-33</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5796,7 +5800,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5807,7 +5811,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-33</id>
+														<id>-34</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5818,7 +5822,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5827,7 +5831,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5836,7 +5840,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5845,7 +5849,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5854,7 +5858,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5863,7 +5867,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5892,7 +5896,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-34</id>
+														<id>-35</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5903,7 +5907,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5912,7 +5916,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5921,7 +5925,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5930,7 +5934,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5939,7 +5943,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5948,7 +5952,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5957,7 +5961,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5966,7 +5970,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5984,7 +5988,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6002,7 +6006,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6011,7 +6015,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6029,7 +6033,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6047,7 +6051,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6067,19 +6071,6 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-35</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
                                                                                                                 <id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
@@ -6104,7 +6095,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6113,7 +6104,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6135,7 +6126,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6162,7 +6153,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6171,7 +6162,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6189,7 +6180,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-29</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6207,7 +6198,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6216,7 +6207,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6249,7 +6240,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6258,7 +6249,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6298,7 +6289,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6307,7 +6298,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6316,7 +6307,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-35</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6524,9 +6515,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by the T copy constructor.&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6548,7 +6537,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by the T copy constructor.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6691,9 +6682,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by T1..TN copy constructor.&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6704,7 +6693,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by T1..TN copy constructor.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6901,7 +6892,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6938,6 +6929,17 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-8</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>`#include &lt;(:link </string>
@@ -6945,7 +6947,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6956,7 +6958,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-8</id>
+														<id>-9</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6967,7 +6969,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -6978,7 +6980,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-9</id>
+														<id>-10</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6989,7 +6991,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7000,7 +7002,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-10</id>
+														<id>-11</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7011,7 +7013,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7022,7 +7024,20 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-11</id>
+														<id>-12</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-13</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7033,7 +7048,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-12</id>
+														<id>-14</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7044,7 +7059,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7055,7 +7070,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-13</id>
+														<id>-15</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7066,7 +7081,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7077,7 +7092,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-16</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7088,7 +7103,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7099,7 +7114,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-15</id>
+														<id>-17</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7110,7 +7125,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-16</id>
+														<id>-18</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7123,7 +7138,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-17</id>
+														<id>-19</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7136,7 +7151,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-18</id>
+														<id>-20</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7147,7 +7162,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-19</id>
+														<id>-21</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7158,7 +7173,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7169,7 +7184,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7180,7 +7195,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7191,18 +7206,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-22</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7213,20 +7217,20 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-23</id>
+														<id>-24</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@#include &lt;boost/tuple/tuple.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
+														<id>-25</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7237,7 +7241,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-25</id>
+														<id>-26</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7250,7 +7254,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-26</id>
+														<id>-27</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7261,7 +7265,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-27</id>
+														<id>-28</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7272,7 +7276,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7283,7 +7287,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7294,7 +7298,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7303,7 +7307,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-28</id>
+															<id>-29</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7314,7 +7318,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-30</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7325,7 +7329,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7336,7 +7340,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-30</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7347,7 +7351,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-31</id>
+														<id>-32</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -7358,7 +7362,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-26</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7369,17 +7373,6 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-32</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
                                                                                                                 <id>-33</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
@@ -7406,9 +7399,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>[@#include &lt;boost/tuple/tuple.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7426,7 +7417,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7435,7 +7426,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-16</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7457,7 +7448,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7479,7 +7470,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7512,7 +7503,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-16</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7767,7 +7758,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-11</id>
+										<id>-13</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7792,23 +7783,23 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>4DC5257313CB18D2FB860A51C10E0CA1F26C0130EF7884BEA62F2B9202796B14</strong>
-												<weak>1113469887</weak>
-												<size>1807</size>
-												<position>91</position>
+												<strong>FED4CEA991FBBA8DF26B5652CE68C929C38BEE74DFD6C8E89E2A623BF0A61503</strong>
+												<weak>1244906377</weak>
+												<size>2548</size>
+												<position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/throw_exception.hpp</string>
+											<string>../../../../boost/exception/diagnostic_information.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-36</id>
+										<id>-26</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7816,23 +7807,23 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>FC684D0DD5A9732B4130F2AB3DB6E0491D0F523E14B7FB738B2019EA2C7F8717</strong>
-												<weak>2229778754</weak>
-												<size>631</size>
-												<position>319</position>
+												<strong>EE6990C848AF26755A4A3D327073CC8122B3D2C0D00DA2B0F33E4D8805ACB911</strong>
+												<weak>465181157</weak>
+												<size>11204</size>
+												<position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../example/cloning_2.cpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-34</id>
+										<id>-14</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7840,23 +7831,23 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>D9B8E6AA12A4F33953B1A961FA590C5A3840234B6531CA8C04AC985AD5800835</strong>
-												<weak>2432554768</weak>
-												<size>702</size>
-												<position>408</position>
+												<strong>4DC5257313CB18D2FB860A51C10E0CA1F26C0130EF7884BEA62F2B9202796B14</strong>
+												<weak>1113469887</weak>
+												<size>1807</size>
+												<position>91</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../example/enable_error_info.cpp</string>
+											<string>../../../../boost/throw_exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-26</id>
+										<id>-36</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7864,47 +7855,51 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>0C00BEB179039380247D771B12C728884E9A3E5B483AC63CD5789852C7A5CC35</strong>
-												<weak>2506662970</weak>
-												<size>2467</size>
-												<position>323</position>
+												<strong>FC684D0DD5A9732B4130F2AB3DB6E0491D0F523E14B7FB738B2019EA2C7F8717</strong>
+												<weak>2229778754</weak>
+												<size>631</size>
+												<position>319</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/enable_error_info.hpp</string>
+											<string>../../example/cloning_2.cpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-14</id>
+										<id>-35</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>1</size>
-												<strong>5373E336DC4892A41D31694BCA1146382FC3137819A04689CA1F9FFAF1CFAB3B</strong>
-												<weak>4050491732</weak>
-												<size>466</size>
-												<position>307</position>
+												<size>2</size>
+												<strong>214D17B425C1C447F952970DA6B1A778AD45CCA513405EB2DA6EBE87285A852A</strong>
+												<weak>1906283610</weak>
+												<size>2414</size>
+												<position>457</position>
+												<strong>6B355BB18EB534B5221822257C7A7F834692C7256E5D118F5443C7D905731578</strong>
+												<weak>1509743294</weak>
+												<size>810</size>
+												<position>1598</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../example/cloning_1.cpp</string>
+											<string>../../../../boost/exception/diagnostic_information.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-22</id>
+										<id>-32</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7912,38 +7907,34 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>DA91A64CCC9A5B149DFB580E5466539607C9CE92A93F56CE4C03996A468C1145</strong>
-												<weak>2002159572</weak>
-												<size>10547</size>
-												<position>323</position>
+												<strong>D9B8E6AA12A4F33953B1A961FA590C5A3840234B6531CA8C04AC985AD5800835</strong>
+												<weak>2432554768</weak>
+												<size>702</size>
+												<position>408</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../example/enable_error_info.cpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-12</id>
+										<id>-27</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>3EFECC50102590C4E9074D4F86B0E8F831D933193CCF70B8D80E8A0CF345C150</strong>
-												<weak>877841526</weak>
-												<size>4772</size>
-												<position>726</position>
-												<strong>82BA37021947A2C641B3285537EB8841A6AC59067CE01D873BC19725BAADCFC1</strong>
-												<weak>1244314370</weak>
-												<size>733</size>
-												<position>243</position>
+												<size>1</size>
+												<strong>0E1089A09F6986E4D1393EC178D2F0A5CA5CAFCF9D2F4B96AEACA14E95ED2B38</strong>
+												<weak>717228119</weak>
+												<size>4814</size>
+												<position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
@@ -7956,35 +7947,31 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-9</id>
+										<id>-28</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>3EFECC50102590C4E9074D4F86B0E8F831D933193CCF70B8D80E8A0CF345C150</strong>
-												<weak>877841526</weak>
-												<size>4772</size>
-												<position>726</position>
-												<strong>C552A651ADC0B9506373CC1A78CB4D7D0342BC99BD24F2F2B8CAD3B555037FE7</strong>
-												<weak>141521629</weak>
-												<size>382</size>
-												<position>4384</position>
+												<size>1</size>
+												<strong>5373E336DC4892A41D31694BCA1146382FC3137819A04689CA1F9FFAF1CFAB3B</strong>
+												<weak>4050491732</weak>
+												<size>466</size>
+												<position>307</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/info.hpp</string>
+											<string>../../example/cloning_1.cpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-13</id>
+										<id>-7</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7992,27 +7979,27 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-												<weak>737034355</weak>
-												<size>10349</size>
-												<position>521</position>
-												<strong>F87D7E0321BDDAE23D5A6667CB12116411468AEC54E3B35FB9C8CA94BFECA41E</strong>
-												<weak>1149388739</weak>
-												<size>296</size>
-												<position>9929</position>
+												<strong>F126A8CB9244BC9DE8BD1D89B47453028CEC694D7EF40BB4474018FA6F056E4C</strong>
+												<weak>3161833426</weak>
+												<size>1527</size>
+												<position>504</position>
+												<strong>8E724ECF48FB144FBAC1B7F27AE077812CDA75F1A05A08F951DD7F9D54863425</strong>
+												<weak>4144026351</weak>
+												<size>676</size>
+												<position>845</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/get_error_info.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-7</id>
+										<id>-6</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8020,111 +8007,127 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-												<weak>737034355</weak>
-												<size>10349</size>
-												<position>521</position>
-												<strong>CCBCB5EADA66B82DFC7650F467A0E51CA5B10EFCD3729EDFB038A1C5DCB5722D</strong>
-												<weak>1007135774</weak>
-												<size>701</size>
-												<position>3933</position>
+												<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+												<weak>3608148048</weak>
+												<size>2740</size>
+												<position>413</position>
+												<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+												<weak>1650706135</weak>
+												<size>1707</size>
+												<position>868</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-37</id>
+										<id>-21</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-												<weak>737034355</weak>
-												<size>10349</size>
-												<position>521</position>
-												<strong>C84057F7B3954843F5360E9764B35DC5EB1D8ED65CA9F1B6B633D95B417E3AA9</strong>
-												<weak>1591300832</weak>
-												<size>2322</size>
-												<position>1609</position>
+												<size>4</size>
+												<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+												<weak>3608148048</weak>
+												<size>2740</size>
+												<position>413</position>
+												<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+												<weak>1650706135</weak>
+												<size>1707</size>
+												<position>868</position>
+												<strong>85EE1980CFB24E054EDB1B3BDFA61FD4D65AD0EF248A1A42D4C2552700459327</strong>
+												<weak>2238151539</weak>
+												<size>428</size>
+												<position>401</position>
+												<strong>AD3F339F7126003907BCBDB3EF846FCACA895132E1100D202DA67D2B7846EE65</strong>
+												<weak>3032091776</weak>
+												<size>60</size>
+												<position>369</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-8</id>
+										<id>-33</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-												<weak>737034355</weak>
-												<size>10349</size>
-												<position>521</position>
-												<strong>8A536C83AAA6BF19C2B173BE32022C6363004D5F0B88F7982711F5D66F539FE9</strong>
-												<weak>3888149824</weak>
-												<size>2495</size>
-												<position>7432</position>
+												<size>3</size>
+												<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+												<weak>3608148048</weak>
+												<size>2740</size>
+												<position>413</position>
+												<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+												<weak>1650706135</weak>
+												<size>1707</size>
+												<position>868</position>
+												<strong>9043738F71C025266AC2C0A2BEDC9DA3579175BE5BA672E59D136559D4269190</strong>
+												<weak>317401972</weak>
+												<size>164</size>
+												<position>57</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-29</id>
+										<id>-31</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>4546B9848279614FBDF70D0FB35B6D7A3432BF205DC9EC15C6016A77D2124E53</strong>
-												<weak>737034355</weak>
-												<size>10349</size>
-												<position>521</position>
-												<strong>4B6ED02EA5B5A3B326838794C37ED01C5DC3E8D89FA78E62B9F7A0C78D4DB6FD</strong>
-												<weak>2715164371</weak>
-												<size>116</size>
-												<position>10227</position>
+												<size>3</size>
+												<strong>B5B48CB1FFAE29EB28A92336685CBB1DCD53090C7A889BC99659CF306129265E</strong>
+												<weak>3608148048</weak>
+												<size>2740</size>
+												<position>413</position>
+												<strong>242B7AD2C634B20F99722AD5EF05F11109D14C11A2F7EB2D794D5E01B8BBCBCC</strong>
+												<weak>1650706135</weak>
+												<size>1707</size>
+												<position>868</position>
+												<strong>BACD79DFB4C710C1A67687FC6344DF2251E2379613C2DF5B2729B2CD37E24EA3</strong>
+												<weak>458367129</weak>
+												<size>154</size>
+												<position>245</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-5</id>
+										<id>-25</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8135,7 +8138,7 @@
                                                                                                 <strong>49D31376D97691F7C84A134B5D8C7C66EF1ED6901D376CA250D634AE2B38AB5E</strong>
                                                                                                 <weak>549270010</weak>
                                                                                                 <size>163</size>
-												<position>561</position>
+												<position>610</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
@@ -8148,7 +8151,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-20</id>
+										<id>-22</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8156,9 +8159,9 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>8DF6E9F9346E2A1297844433695E2BAE1AD14FBDB6D943D81B87200FB9F9AE66</strong>
-												<weak>4241576983</weak>
-												<size>5175</size>
+												<strong>ABA5BB25BAD31B070056FA9595F73F6F0E7F2A1D36D8A2ECDEBE6A2872E0E966</strong>
+												<weak>980578466</weak>
+												<size>2271</size>
                                                                                                 <position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
@@ -8166,13 +8169,13 @@
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/info.hpp</string>
+											<string>../../../../boost/exception/enable_error_info.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-27</id>
+										<id>-16</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8180,9 +8183,9 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>A0BB65AB464BCD75627D942684603207867D3C5D1BAE93902A812A07677B596F</strong>
-												<weak>3668753278</weak>
-												<size>646</size>
+												<strong>3D62495D55F856D594F8BCFD89F283A1B55638AE7B7609C8EFE4A84371EF6867</strong>
+												<weak>1383536793</weak>
+												<size>2830</size>
                                                                                                 <position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
@@ -8190,13 +8193,13 @@
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/diagnostic_information.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-25</id>
+										<id>-19</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8220,31 +8223,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-16</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>3999B09B03466CF6F624CB20689AE32FEFBAF81B2ADDA4D0E6777BC052B1BE70</strong>
-												<weak>2497361403</weak>
-												<size>3349</size>
-												<position>323</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-17</id>
+										<id>-18</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8252,89 +8231,77 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-												<weak>1525247529</weak>
-												<size>3149</size>
-												<position>523</position>
-												<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-												<weak>1676293364</weak>
-												<size>2098</size>
-												<position>886</position>
+												<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+												<weak>2089604779</weak>
+												<size>11016</size>
+												<position>511</position>
+												<strong>F87D7E0321BDDAE23D5A6667CB12116411468AEC54E3B35FB9C8CA94BFECA41E</strong>
+												<weak>1149388739</weak>
+												<size>296</size>
+												<position>10596</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-19</id>
+										<id>-8</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>4</size>
-												<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-												<weak>1525247529</weak>
-												<size>3149</size>
-												<position>523</position>
-												<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-												<weak>1676293364</weak>
-												<size>2098</size>
-												<position>886</position>
-												<strong>85EE1980CFB24E054EDB1B3BDFA61FD4D65AD0EF248A1A42D4C2552700459327</strong>
-												<weak>2238151539</weak>
-												<size>428</size>
-												<position>928</position>
-												<strong>AD3F339F7126003907BCBDB3EF846FCACA895132E1100D202DA67D2B7846EE65</strong>
-												<weak>3032091776</weak>
-												<size>60</size>
-												<position>369</position>
+												<size>2</size>
+												<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+												<weak>2089604779</weak>
+												<size>11016</size>
+												<position>511</position>
+												<strong>CCBCB5EADA66B82DFC7650F467A0E51CA5B10EFCD3729EDFB038A1C5DCB5722D</strong>
+												<weak>1007135774</weak>
+												<size>701</size>
+												<position>3933</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-32</id>
+										<id>-37</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>3</size>
-												<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-												<weak>1525247529</weak>
-												<size>3149</size>
-												<position>523</position>
-												<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-												<weak>1676293364</weak>
-												<size>2098</size>
-												<position>886</position>
-												<strong>BAC52AC87CFA3174B3352140A8DC10BB7F48C945FC87787C3AC96F0FC2CFDB40</strong>
-												<weak>1066412964</weak>
-												<size>165</size>
-												<position>57</position>
+												<size>2</size>
+												<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+												<weak>2089604779</weak>
+												<size>11016</size>
+												<position>511</position>
+												<strong>7890935423C731BD8E7DE2820DF7E85C72126B2EAB9A45B0AAFA5749DD1A9D57</strong>
+												<weak>2497085175</weak>
+												<size>2528</size>
+												<position>8066</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
@@ -8347,32 +8314,28 @@
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>3</size>
-												<strong>566065B952135D9C2AAD7609E3CDEC4AE9D21A4EF5C318DE51C476C79EBE8277</strong>
-												<weak>1525247529</weak>
-												<size>3149</size>
-												<position>523</position>
-												<strong>9E33ECD747FA0BFFED4D2C8916E3A9B8CD737177200F3A4078DECECC94E3EF24</strong>
-												<weak>1676293364</weak>
-												<size>2098</size>
-												<position>886</position>
-												<strong>BACD79DFB4C710C1A67687FC6344DF2251E2379613C2DF5B2729B2CD37E24EA3</strong>
-												<weak>458367129</weak>
-												<size>154</size>
-												<position>246</position>
+												<size>2</size>
+												<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+												<weak>2089604779</weak>
+												<size>11016</size>
+												<position>511</position>
+												<strong>C84057F7B3954843F5360E9764B35DC5EB1D8ED65CA9F1B6B633D95B417E3AA9</strong>
+												<weak>1591300832</weak>
+												<size>2322</size>
+												<position>1609</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-24</id>
+										<id>-9</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8380,27 +8343,27 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>7ACC4E316D4EDB3EC7AEC35FED3ADB47DDF75D575028D7BCD11C5233E4F4A277</strong>
-												<weak>4268848542</weak>
-												<size>2333</size>
-												<position>457</position>
-												<strong>61DE70107961C0B9A65674017F91FF85190CF84B4F3B0CA7AC04A7E16DE80B37</strong>
-												<weak>3187961206</weak>
-												<size>2301</size>
-												<position>26</position>
+												<strong>78F37A2801CADB066084578244BC93958EAD33507F30C07353EA7D161FFBF973</strong>
+												<weak>2089604779</weak>
+												<size>11016</size>
+												<position>511</position>
+												<strong>4B6ED02EA5B5A3B326838794C37ED01C5DC3E8D89FA78E62B9F7A0C78D4DB6FD</strong>
+												<weak>2715164371</weak>
+												<size>116</size>
+												<position>10894</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/enable_error_info.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-40</id>
+										<id>-5</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8436,9 +8399,9 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>86DE119A4A3E9251475D1291AF99B769E304A8E0172409FC2A4E02B8D4BF73A2</strong>
-												<weak>767141628</weak>
-												<size>1417</size>
+												<strong>CAB4D823BD4720B71E1CA5BE482AC95B42A9E07CD5E08671EA23184635F281A2</strong>
+												<weak>3077708282</weak>
+												<size>89</size>
                                                                                                 <position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
@@ -8446,37 +8409,41 @@
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/get_error_info.hpp</string>
+											<string>../../../../boost/exception/error_info.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-44</id>
+										<id>-12</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>1</size>
-												<strong>CAB4D823BD4720B71E1CA5BE482AC95B42A9E07CD5E08671EA23184635F281A2</strong>
-												<weak>3077708282</weak>
-												<size>89</size>
-												<position>323</position>
+												<size>2</size>
+												<strong>040AF162DE93F61F89B118788A02CEA76E19F2F9D66E8FC4D4F0B66C6C4CDCA6</strong>
+												<weak>1391149574</weak>
+												<size>2137</size>
+												<position>457</position>
+												<strong>B752D5E37E6F1F71AD491E0DEF2C7D7C3ED4C9E78F01443EC408B751C83D521F</strong>
+												<weak>2684451358</weak>
+												<size>412</size>
+												<position>1719</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/error_info.hpp</string>
+											<string>../../../../boost/exception/enable_error_info.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-23</id>
+										<id>-40</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8528,7 +8495,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-35</id>
+										<id>-24</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8552,7 +8519,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-10</id>
+										<id>-11</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8560,27 +8527,55 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>0C9E5FE5B32FD3F31875CF6AD87A485CACC42754EE56F0E72D9D9749734959D5</strong>
-												<weak>2969409401</weak>
-												<size>544</size>
-												<position>425</position>
-												<strong>1DE66DC4BD5E2E323BA4281B4BAB063AF5E9F7E4A5FE32BA3C0686A844FBA86E</strong>
-												<weak>4200042321</weak>
-												<size>512</size>
-												<position>26</position>
+												<strong>353C90D92FFBB5A5616E5A9FAA19868B8234159FB714A1631B4E415B941DC9D3</strong>
+												<weak>3466161861</weak>
+												<size>4362</size>
+												<position>775</position>
+												<strong>C552A651ADC0B9506373CC1A78CB4D7D0342BC99BD24F2F2B8CAD3B555037FE7</strong>
+												<weak>141521629</weak>
+												<size>382</size>
+												<position>3974</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/diagnostic_information.hpp</string>
+											<string>../../../../boost/exception/info.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-31</id>
+										<id>-15</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>353C90D92FFBB5A5616E5A9FAA19868B8234159FB714A1631B4E415B941DC9D3</strong>
+												<weak>3466161861</weak>
+												<size>4362</size>
+												<position>775</position>
+												<strong>CF9032A2CB14D66F0F004C0AFDE2BB94321F405D6D95AC46EC5350AB4843A4F1</strong>
+												<weak>1073329133</weak>
+												<size>715</size>
+												<position>243</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/info.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-10</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8604,7 +8599,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-18</id>
+										<id>-20</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8628,22 +8623,18 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-15</id>
+										<id>-17</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>AE3A2E2D2C5F64EF089B5E3B27F1D42E1D0FD99D0CF898C7D5F828D4401090DB</strong>
-												<weak>2880991434</weak>
-												<size>1268</size>
-												<position>472</position>
-												<strong>40062E1E97460C1E0AB685CE189F5D6607389A5A533C9E7D28050B4037EE3A50</strong>
-												<weak>4283132066</weak>
-												<size>1236</size>
-												<position>26</position>
+												<size>1</size>
+												<strong>E6CCBC6F6FEAEF1E95E23AFC7A7268DB35549B5951BE08BC7B4429B7490195ED</strong>
+												<weak>1344405806</weak>
+												<size>1708</size>
+												<position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
@@ -8656,7 +8647,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-6</id>
+										<id>-44</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8684,7 +8675,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-28</id>
+										<id>-29</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8708,7 +8699,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-33</id>
+										<id>-34</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8732,7 +8723,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-21</id>
+										<id>-23</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                         </sorted>
@@ -8781,7 +8772,7 @@
                                                                                         <id>-7</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8790,7 +8781,7 @@
                                                                                         <id>-8</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>type</string>
+									<string>exception_ptr free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8808,7 +8799,7 @@
                                                                                         <id>-10</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>type</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8817,7 +8808,7 @@
                                                                                         <id>-11</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>tutorial</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8835,7 +8826,7 @@
                                                                                         <id>-13</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info free function</string>
+									<string>tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8844,7 +8835,7 @@
                                                                                         <id>-14</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8853,7 +8844,7 @@
                                                                                         <id>-15</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>diagnostic_information tutorial</string>
+									<string>error_info free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8862,7 +8853,7 @@
                                                                                         <id>-16</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>error_info</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8871,7 +8862,7 @@
                                                                                         <id>-17</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>diagnostic_information tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8880,7 +8871,7 @@
                                                                                         <id>-18</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8889,7 +8880,7 @@
                                                                                         <id>-19</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>type</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8898,7 +8889,7 @@
                                                                                         <id>-20</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8907,7 +8898,7 @@
                                                                                         <id>-21</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>type</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8916,7 +8907,7 @@
                                                                                         <id>-22</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8925,7 +8916,7 @@
                                                                                         <id>-23</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8934,7 +8925,7 @@
                                                                                         <id>-24</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>function</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8943,7 +8934,7 @@
                                                                                         <id>-25</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8952,7 +8943,7 @@
                                                                                         <id>-26</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>tutorial</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8961,7 +8952,7 @@
                                                                                         <id>-27</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8970,7 +8961,7 @@
                                                                                         <id>-28</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info free function</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8979,7 +8970,7 @@
                                                                                         <id>-29</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>error_info free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8988,7 +8979,7 @@
                                                                                         <id>-30</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>function</string>
+									<string>exception_ptr free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8997,7 +8988,7 @@
                                                                                         <id>-31</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>diagnostic_information free function</string>
+									<string>function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9006,7 +8997,7 @@
                                                                                         <id>-32</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>function</string>
+									<string>diagnostic_information free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9015,7 +9006,7 @@
                                                                                         <id>-33</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9033,7 +9024,7 @@
                                                                                         <id>-35</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>

Modified: trunk/libs/exception/example/example_io.cpp
==============================================================================
--- trunk/libs/exception/example/example_io.cpp	(original)
+++ trunk/libs/exception/example/example_io.cpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -41,7 +41,7 @@
     char const *
     what() const throw()
         {
-        return boost::exception::diagnostic_information();
+        return "example_io error";
         }
 
     protected:
@@ -170,7 +170,7 @@
     dump_file_info(x);
     dump_clib_info(x);
     std::cout << "\nOutput from diagnostic_information():\n";
-    std::cout << x.diagnostic_information();
+    std::cout << diagnostic_information(x);
     }
 
 int

Modified: trunk/libs/exception/test/cloning_test.cpp
==============================================================================
--- trunk/libs/exception/test/cloning_test.cpp	(original)
+++ trunk/libs/exception/test/cloning_test.cpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -351,8 +351,10 @@
     test_std_exception_what<std::out_of_range>();
     test_std_exception_what<std::logic_error>();
     test_std_exception<std::bad_alloc>();
+#ifndef BOOST_NO_TYPEID
     test_std_exception<std::bad_cast>();
     test_std_exception<std::bad_typeid>();
+#endif
     test_std_exception<std::bad_exception>();
 
     try

Modified: trunk/libs/exception/test/diagnostic_information_test.cpp
==============================================================================
--- trunk/libs/exception/test/diagnostic_information_test.cpp	(original)
+++ trunk/libs/exception/test/diagnostic_information_test.cpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -38,12 +38,6 @@
     {
     };
 
-std::string
-get_diagnostic_information( std::exception const & x )
-    {
-    return boost::diagnostic_information(x);
-    }
-
 int
 main()
     {
@@ -57,7 +51,7 @@
     catch(
     std::exception & x )
         {
-        std::string di=get_diagnostic_information(x);
+        std::string di=boost::diagnostic_information(x);
         BOOST_TEST(di.find("type:")!=std::string::npos);
         BOOST_TEST(di.find("error1")!=std::string::npos);
         }
@@ -75,11 +69,26 @@
     catch(
     std::exception & x )
         {
-        std::string di=get_diagnostic_information(x);
+        std::string di=boost::diagnostic_information(x);
         BOOST_TEST(di.find("type:")!=std::string::npos);
-#ifndef BOOST_NO_RTTI
         BOOST_TEST(di.find("error2")!=std::string::npos);
-#endif
+        }
+    catch(
+    ... )
+        {
+        BOOST_TEST(false);
+        }
+    try
+        {
+        error2 x; x << tag_int(42);
+        BOOST_TEST(x.what()==std::string("error2"));
+        throw x;
+        }
+    catch(
+    boost::exception & x )
+        {
+        std::string di=boost::diagnostic_information(x);
+        BOOST_TEST(di.find("type:")!=std::string::npos);
         BOOST_TEST(di.find("test_tag")!=std::string::npos);
         }
     catch(
@@ -96,9 +105,9 @@
     catch(
     boost::exception & x )
         {
-        std::string w1 = x.diagnostic_information();
+        std::string w1 = diagnostic_information(x);
         x << tag_int(2);
-        std::string w2 = x.diagnostic_information();
+        std::string w2 = diagnostic_information(x);
         BOOST_TEST( w1!=w2 );
         BOOST_TEST(w1.find("test_tag")!=std::string::npos);
         BOOST_TEST(w2.find("test_tag")!=std::string::npos);

Modified: trunk/libs/exception/test/enable_error_info_test.cpp
==============================================================================
--- trunk/libs/exception/test/enable_error_info_test.cpp	(original)
+++ trunk/libs/exception/test/enable_error_info_test.cpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -45,7 +45,26 @@
     catch(
     std::exception & x )
         {
-        BOOST_TEST( 42==*boost::get_error_info<test_int>(x) );
+#ifdef BOOST_NO_RTTI
+        try
+            {
+            throw;
+            }
+        catch(
+        boost::exception & x )
+            {
+#endif
+            BOOST_TEST( boost::get_error_info<test_int>(x) );
+            if( boost::shared_ptr<int const> p=boost::get_error_info<test_int>(x) )
+                BOOST_TEST( 42==*p );
+#ifdef BOOST_NO_RTTI
+            }
+        catch(
+        ... )
+            {
+            BOOST_TEST(false);
+            }
+#endif
         BOOST_TEST( std::string(x.what())==std::string("exception test length error") );
         }
     catch(

Modified: trunk/libs/exception/test/error_info_test.cpp
==============================================================================
--- trunk/libs/exception/test/error_info_test.cpp	(original)
+++ trunk/libs/exception/test/error_info_test.cpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -10,12 +10,37 @@
 struct throws_on_copy;
 struct non_printable { };
 
+struct
+user_data
+    {
+    int & count;
+
+    explicit
+    user_data( int & count ):
+        count(count)
+        {
+        ++count;
+        }
+
+    user_data( user_data const & x ):
+        count(x.count)
+        {
+        ++count;
+        }
+
+    ~user_data()
+        {
+        --count;
+        }
+    };
+
 typedef boost::error_info<struct tag_test_1,int> test_1;
 typedef boost::error_info<struct tag_test_2,unsigned int> test_2;
 typedef boost::error_info<struct tag_test_3,float> test_3;
 typedef boost::error_info<struct tag_test_4,throws_on_copy> test_4;
 typedef boost::error_info<struct tag_test_5,std::string> test_5;
 typedef boost::error_info<struct tag_test_6,non_printable> test_6;
+typedef boost::error_info<struct tag_user_data,user_data> test_7;
 
 struct
 test_exception:
@@ -135,7 +160,9 @@
     catch(
     test_exception & x )
         {
-        BOOST_TEST( boost::exception_detail::get_boost_exception(&x) );
+#ifndef BOOST_NO_RTTI
+        BOOST_TEST( dynamic_cast<boost::exception const *>(&x)!=0 );
+#endif
         }
     catch(
     ... )
@@ -256,6 +283,29 @@
         }
     }
 
+void
+test_lifetime()
+    {
+    int count=0;
+    try
+        {
+        throw test_exception() << test_7(user_data(count));
+        BOOST_TEST(false);
+        }
+    catch(
+    boost::exception & x )
+        {
+        BOOST_TEST(count==1);
+        BOOST_TEST( boost::get_error_info<test_7>(x) );
+        }
+    catch(
+    ... )
+        {
+        BOOST_TEST(false);
+        }
+    BOOST_TEST(!count);
+    }
+
 int
 main()
     {
@@ -265,5 +315,6 @@
     test_basic_throw_catch();
     test_catch_add_info();
     test_add_tuple();
+    test_lifetime();
     return boost::report_errors();
     }

Modified: trunk/libs/exception/test/throw_exception_test.cpp
==============================================================================
--- trunk/libs/exception/test/throw_exception_test.cpp	(original)
+++ trunk/libs/exception/test/throw_exception_test.cpp	2008-08-29 22:57:12 EDT (Fri, 29 Aug 2008)
@@ -47,9 +47,26 @@
         catch(
         T & y )
             {
-            BOOST_TEST(boost::get_error_info<test_data>(y));
-            if( boost::shared_ptr<int const> d=boost::get_error_info<test_data>(y) )
-                BOOST_TEST(*d==42);
+#ifdef BOOST_NO_RTTI
+            try
+                {
+                throw;
+                }
+            catch(
+            boost::exception & y )
+                {
+#endif
+                BOOST_TEST(boost::get_error_info<test_data>(y));
+                if( boost::shared_ptr<int const> d=boost::get_error_info<test_data>(y) )
+                    BOOST_TEST(*d==42);
+#ifdef BOOST_NO_RTTI
+                }
+            catch(
+            ... )
+                {
+                BOOST_TEST(false);
+                }
+#endif
             BOOST_TEST(y.x_==42);
             }
         catch(