diff --git a/doc/boost_exception_diagnostic_information_hpp.html b/doc/boost_exception_diagnostic_information_hpp.html
index a27fe2d..ad550d4 100644
--- a/doc/boost_exception_diagnostic_information_hpp.html
+++ b/doc/boost_exception_diagnostic_information_hpp.html
@@ -30,7 +30,9 @@ boost
 <span class="RenoIncludeSPAN">    class <span class="RenoLink"><a href="exception.html">exception</a></span>;</span>
 
 <span class="RenoIncludeSPAN">    <span class="RenoIncludeSPAN">template &lt;class E&gt;
-    std::string <span class="RenoLink"><a href="diagnostic_information.html">diagnostic_information</a></span>( E const &amp; e );</span>    
+    std::string <span class="RenoLink"><a href="diagnostic_information.html">diagnostic_information</a></span>( E const &amp; e );
+    
+    std::string <span class="RenoLink"><a href="diagnostic_information.html">diagnostic_information</a></span>( <span class="RenoLink"><a href="exception_ptr.html">exception_ptr</a></span> const &amp; p );</span>    
     
     <span class="RenoIncludeSPAN">std::string <span class="RenoLink"><a href="current_exception_diagnostic_information.html">current_exception_diagnostic_information</a></span>();</span></span>
     }</pre>
diff --git a/doc/current_exception_diagnostic_information.html b/doc/current_exception_diagnostic_information.html
index 6366f63..54174b7 100644
--- a/doc/current_exception_diagnostic_information.html
+++ b/doc/current_exception_diagnostic_information.html
@@ -55,6 +55,7 @@ main()
 <h3>See Also:</h3>
 <div class="RenoPageList"><a href="boost-exception.html">Boost Exception<br/>
 </a><a href="boost_exception_diagnostic_information_hpp.html">boost/exception/diagnostic_information.hpp<br/>
+</a><a href="diagnostic_information.html">diagnostic_information<br/>
 </a></div>
 </div>
 <!-- Copyright (c) 2006-2009 Emil Dotchevski and Reverge Studios, Inc. -->
diff --git a/doc/diagnostic_information.html b/doc/diagnostic_information.html
index 9243f46..1ec4a97 100644
--- a/doc/diagnostic_information.html
+++ b/doc/diagnostic_information.html
@@ -26,10 +26,12 @@
 boost
     {
 <span class="RenoIncludeSPAN">    template &lt;class E&gt;
-    std::string <span class="RenoLink">diagnostic_information</span>( E const &amp; e );</span>
+    std::string <span class="RenoLink">diagnostic_information</span>( E const &amp; e );
+    
+    std::string <span class="RenoLink">diagnostic_information</span>( <span class="RenoLink"><a href="exception_ptr.html">exception_ptr</a></span> const &amp; p );</span>
     }</pre>
 </div><h4>Returns:</h4>
-<p>A string value that contains varying amount of implementation-specific diagnostic information about the passed exception object:</p>
+<p>A string value that contains varying amount of implementation-specific diagnostic information about the passed object:</p>
 <div><ul><li>If E can be statically converted to boost::<span class="RenoLink"><a href="exception.html">exception</a></span>, the returned value contains the string representations of all <span class="RenoLink"><a href="error_info.html">error_info</a></span> objects stored in the boost::<span class="RenoLink"><a href="exception.html">exception</a></span> through <span class="RenoLink"><a href="exception_operator_shl.html">operator&lt;&lt;</a></span>, along with other diagnostic information relevant to the exception. If e can be dynamically converted to std::exception, the returned value also contains the what() string.</li>
 <li>Otherwise, if E can be statically converted std::exception:<div><ul><li>if e can be dynamically converted to boost::exception, the returned value is the same as if E could be statically converted to boost::<span class="RenoLink"><a href="exception.html">exception</a></span>;</li>
 <li>otherwise the returned value contains the what() string.</li>
@@ -43,6 +45,17 @@ boost
 <li>Unqualified call to s &lt;&lt; x.<span class="RenoLink"><a href="error_info_value.html">value</a></span>(), where s is a std::ostringstream.</li>
 </ol></div>
 <p>The first successfully bound function is used at the time <span class="RenoLink">diagnostic_information</span> is called; if all 3 overload resolutions are unsuccessful, the system is unable to convert the <span class="RenoLink"><a href="error_info.html">error_info</a></span> object to string, and <i>an unspecified stub string value is used without issuing a compile error.</i></p>
+<p>The <span class="RenoLink"><a href="exception_ptr.html">exception_ptr</a></span> overload of <span class="RenoLink">diagnostic_information</span> is equivalent to:</p>
+<pre>if( p )
+    try
+        {
+        <span class="RenoLink"><a href="rethrow_exception.html">rethrow_exception</a></span>(p);
+        }
+    catch(...)
+        {
+        return <span class="RenoLink"><a href="current_exception_diagnostic_information.html">current_exception_diagnostic_information</a></span>();
+        }
+else return &lt;unspecified-string-value&gt;;</pre>
 <h4>Notes:</h4>
 <div><ul><li>The format of the returned string is unspecified.</li>
 <li>The returned string is <i>not</i> user-friendly.</li>
diff --git a/doc/exception_ptr.html b/doc/exception_ptr.html
index 90f330a..a5600b3 100644
--- a/doc/exception_ptr.html
+++ b/doc/exception_ptr.html
@@ -44,6 +44,7 @@ boost
 </a><a href="boost_exception_ptr_hpp.html">boost/exception_ptr.hpp<br/>
 </a><a href="copy_exception.html">copy_exception<br/>
 </a><a href="current_exception.html">current_exception<br/>
+</a><a href="diagnostic_information.html">diagnostic_information<br/>
 </a><a href="enable_current_exception.html">enable_current_exception<br/>
 </a><a href="frequently_asked_questions.html">Frequently Asked Questions<br/>
 </a><a href="original_exception_type.html">original_exception_type<br/>
diff --git a/doc/rethrow_exception.html b/doc/rethrow_exception.html
index 7b4b2fd..64e0fe3 100644
--- a/doc/rethrow_exception.html
+++ b/doc/rethrow_exception.html
@@ -35,6 +35,7 @@ boost
 <h3>See Also:</h3>
 <div class="RenoPageList"><a href="boost-exception.html">Boost Exception<br/>
 </a><a href="boost_exception_ptr_hpp.html">boost/exception_ptr.hpp<br/>
+</a><a href="diagnostic_information.html">diagnostic_information<br/>
 </a><a href="exception_ptr.html">exception_ptr<br/>
 </a></div>
 </div>
diff --git a/doc/source/boost-exception.reno b/doc/source/boost-exception.reno
index 3d784a0..96bc310 100644
--- a/doc/source/boost-exception.reno
+++ b/doc/source/boost-exception.reno
@@ -48,6 +48,100 @@
 														<type>
 															<string>reno_context</string>
 														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>2</size>
+																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
+																			<weak>1114955626</weak>
+																			<size>11770</size>
+																			<position>723</position>
+																			<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
+																			<weak>3624753243</weak>
+																			<size>279</size>
+																			<position>26</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>original_exception_type</string>
+															</title>
+															<file_name>
+																<string></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>6</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>1</size>
+																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																			<weak>1282550303</weak>
+																			<size>9192</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>
+															</hook>
+															<title>
+																<string>boost/exception/exception.hpp</string>
+															</title>
+															<file_name>
+																<string></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>7</id>
+														<type>
+															<string>reno_context</string>
+														</type>
 														<object>
 															<hook>
 																<hook>
@@ -93,7 +187,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>6</id>
+														<id>8</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -131,7 +225,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>7</id>
+														<id>9</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -169,7 +263,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>8</id>
+														<id>10</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -207,7 +301,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>9</id>
+														<id>11</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -252,7 +346,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>10</id>
+														<id>12</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -293,104 +387,6 @@
 													<string>(:include include:)&#10;(:auto also:)&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>11</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>2</size>
-																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
-																			<weak>1114955626</weak>
-																			<size>11770</size>
-																			<position>723</position>
-																			<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
-																			<weak>3624753243</weak>
-																			<size>279</size>
-																			<position>26</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>original_exception_type</string>
-															</title>
-															<file_name>
-																<string></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>12</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>2</size>
-																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
-																			<weak>1114955626</weak>
-																			<size>11770</size>
-																			<position>723</position>
-																			<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
-																			<weak>2078296250</weak>
-																			<size>305</size>
-																			<position>10862</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>copy_exception</string>
-															</title>
-															<file_name>
-																<string></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>
@@ -444,6 +440,55 @@
 														<type>
 															<string>reno_context</string>
 														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>2</size>
+																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
+																			<weak>1114955626</weak>
+																			<size>11770</size>
+																			<position>723</position>
+																			<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
+																			<weak>2078296250</weak>
+																			<size>305</size>
+																			<position>10862</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>copy_exception</string>
+															</title>
+															<file_name>
+																<string></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>15</id>
+														<type>
+															<string>reno_context</string>
+														</type>
 														<object>
 															<hook>
 																<hook>
@@ -489,7 +534,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>15</id>
+														<id>16</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -534,7 +579,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>16</id>
+														<id>17</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -587,7 +632,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>17</id>
+														<id>18</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -625,7 +670,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>18</id>
+														<id>19</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -668,7 +713,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>19</id>
+														<id>20</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -677,11 +722,15 @@
 																<hook>
 																	<stream_hook_path>
 																		<container>
-																			<size>1</size>
+																			<size>2</size>
 																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
 																			<weak>1282550303</weak>
 																			<size>9192</size>
 																			<position>323</position>
+																			<strong>F3FB15CD82336271C6E875BC620385322777D16F0B7C233300783CE35710CCBF</strong>
+																			<weak>3292878997</weak>
+																			<size>282</size>
+																			<position>7305</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -695,7 +744,7 @@
 																</file>
 															</hook>
 															<title>
-																<string>boost/exception/exception.hpp</string>
+																<string>enable_error_info</string>
 															</title>
 															<file_name>
 																<string></string>
@@ -713,7 +762,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>20</id>
+														<id>21</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -758,7 +807,52 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>21</id>
+														<id>22</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>1</size>
+																			<strong>04DDC793002AFCF4F4166D250C67D09B6FE8B86224318ED7847AD6EC423B70CA</strong>
+																			<weak>922651615</weak>
+																			<size>433</size>
+																			<position>1032</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../../../boost/throw_exception.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>BOOST_THROW_EXCEPTION</string>
+															</title>
+															<file_name>
+																<string></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>23</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -811,7 +905,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>22</id>
+														<id>24</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -864,7 +958,52 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>23</id>
+														<id>25</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>1</size>
+																			<strong>641BB230CEBF638811480BE0E3A96ABCB7CC9CC7E1C1A9C51FBAB296FFB6B7B1</strong>
+																			<weak>4248389286</weak>
+																			<size>4113</size>
+																			<position>323</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>
+															</hook>
+															<title>
+																<string>boost/exception/info.hpp</string>
+															</title>
+															<file_name>
+																<string></string>
+															</file_name>
+														</object>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>26</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -913,7 +1052,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>24</id>
+														<id>27</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -951,7 +1090,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>25</id>
+														<id>28</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -994,7 +1133,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>26</id>
+														<id>29</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1004,28 +1143,28 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
-																			<weak>1282550303</weak>
-																			<size>9192</size>
-																			<position>323</position>
-																			<strong>F3FB15CD82336271C6E875BC620385322777D16F0B7C233300783CE35710CCBF</strong>
-																			<weak>3292878997</weak>
-																			<size>282</size>
-																			<position>7305</position>
+																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
+																			<weak>1114955626</weak>
+																			<size>11770</size>
+																			<position>723</position>
+																			<strong>B20A3D4631F3B2415EED1888B65FA33D7AED20F86BE196159D9297AAED115787</strong>
+																			<weak>3293519666</weak>
+																			<size>117</size>
+																			<position>11169</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>
 															</hook>
 															<title>
-																<string>enable_error_info</string>
+																<string>rethrow_exception</string>
 															</title>
 															<file_name>
 																<string></string>
@@ -1043,7 +1182,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>27</id>
+														<id>30</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1086,7 +1225,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>28</id>
+														<id>31</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1135,7 +1274,56 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>29</id>
+														<id>32</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>2</size>
+																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
+																			<weak>1114955626</weak>
+																			<size>11770</size>
+																			<position>723</position>
+																			<strong>AF894656AC8CED6190EEEE08B051DBF2106A393E313BB5BB1C17D4808EFED761</strong>
+																			<weak>1496105832</weak>
+																			<size>1753</size>
+																			<position>429</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>exception_ptr</string>
+															</title>
+															<file_name>
+																<string></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>33</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1173,7 +1361,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>30</id>
+														<id>34</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1218,7 +1406,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>31</id>
+														<id>35</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1267,7 +1455,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>32</id>
+														<id>36</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1320,101 +1508,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>33</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>04DDC793002AFCF4F4166D250C67D09B6FE8B86224318ED7847AD6EC423B70CA</strong>
-																			<weak>922651615</weak>
-																			<size>433</size>
-																			<position>1032</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/throw_exception.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>BOOST_THROW_EXCEPTION</string>
-															</title>
-															<file_name>
-																<string></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>34</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>2</size>
-																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
-																			<weak>1114955626</weak>
-																			<size>11770</size>
-																			<position>723</position>
-																			<strong>AF894656AC8CED6190EEEE08B051DBF2106A393E313BB5BB1C17D4808EFED761</strong>
-																			<weak>1496105832</weak>
-																			<size>1753</size>
-																			<position>429</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>exception_ptr</string>
-															</title>
-															<file_name>
-																<string></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>35</id>
+														<id>37</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1463,7 +1557,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>36</id>
+														<id>38</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1512,7 +1606,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>37</id>
+														<id>39</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1561,7 +1655,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>38</id>
+														<id>40</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1610,7 +1704,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>39</id>
+														<id>41</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1653,56 +1747,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>40</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>2</size>
-																			<strong>CEB9022E39DA32E612158FF553D383E13D300D1202CEB754E28B716040EFC414</strong>
-																			<weak>1114955626</weak>
-																			<size>11770</size>
-																			<position>723</position>
-																			<strong>B20A3D4631F3B2415EED1888B65FA33D7AED20F86BE196159D9297AAED115787</strong>
-																			<weak>3293519666</weak>
-																			<size>117</size>
-																			<position>11169</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>rethrow_exception</string>
-															</title>
-															<file_name>
-																<string></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>41</id>
+														<id>42</id>
 														<type>
 															<string>reno_context</string>
 														</type>
@@ -1741,51 +1786,6 @@
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>42</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>641BB230CEBF638811480BE0E3A96ABCB7CC9CC7E1C1A9C51FBAB296FFB6B7B1</strong>
-																			<weak>4248389286</weak>
-																			<size>4113</size>
-																			<position>323</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>
-															</hook>
-															<title>
-																<string>boost/exception/info.hpp</string>
-															</title>
-															<file_name>
-																<string></string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2477,7 +2477,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-7</id>
+															<id>-9</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -2495,7 +2495,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-6</id>
+															<id>-8</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -2747,6 +2747,17 @@
 														<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>
 													<size>9</size>
 													<variant>2</variant>
@@ -2755,7 +2766,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -2764,7 +2775,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-21</id>
+															<id>-23</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -2782,24 +2793,13 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-22</id>
+															<id>-24</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
 													<string> decl pre_indent=&quot;4&quot;:)&#10;    };@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-15</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3198,7 +3198,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-16</id>
+															<id>-17</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3207,7 +3207,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-37</id>
+															<id>-39</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3357,18 +3357,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>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -3379,7 +3368,54 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>11</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-50</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> def:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)&#10;&#10;typedef (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;struct tag_throw_function,char const *&gt; throw_function;&#10;typedef (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;struct tag_throw_file,char const *&gt; throw_file;&#10;typedef (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;struct tag_throw_line,int&gt; throw_line;@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -3390,7 +3426,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -3411,6 +3458,28 @@
 														<id>-9</id>
 													</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>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>
@@ -3430,7 +3499,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-10</id>
+														<id>-12</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3441,7 +3510,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3450,35 +3519,13 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
 													<string> decl:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-11</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-12</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3494,7 +3541,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3519,6 +3566,17 @@
 														<id>-15</id>
 													</shared_ptr>
 												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-16</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>5</size>
 													<variant>2</variant>
@@ -3527,7 +3585,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3543,17 +3601,6 @@
 													<string> decl:)@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-16</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3584,54 +3631,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>11</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-50</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> def:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_throw_function,char const *&gt; throw_function;&#10;typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_throw_file,char const *&gt; throw_file;&#10;typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_throw_line,int&gt; throw_line;@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -3641,6 +3641,17 @@
 														<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>15</size>
 													<variant>2</variant>
@@ -3649,7 +3660,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-15</id>
+															<id>-16</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3658,7 +3669,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-5</id>
+															<id>-7</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3667,7 +3678,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3685,7 +3696,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3694,7 +3705,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-9</id>
+															<id>-11</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -3710,17 +3721,6 @@
 													<string>:)&gt;@]&#10;</string>
 												</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>
@@ -3751,18 +3751,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>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -3773,7 +3762,27 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> def:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-52</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -3795,7 +3804,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-20</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -3960,27 +3980,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> def:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-52</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -4108,7 +4108,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-28</id>
+															<id>-31</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4117,7 +4117,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-11</id>
+															<id>-5</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4126,7 +4126,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4135,7 +4135,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-12</id>
+															<id>-14</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4144,7 +4144,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4153,7 +4153,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-40</id>
+															<id>-29</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4186,7 +4186,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4292,7 +4292,27 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@typedef (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;struct tag_original_exception_type,std::type_info const *&gt; </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-5</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>;@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4358,27 +4378,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_original_exception_type,std::type_info const *&gt; </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-11</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>;@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -4389,27 +4389,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-12</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( T const &amp; e );@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -4431,9 +4411,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
+													<size>5</size>
 													<variant>2</variant>
-													<string>[@template &lt;class Tag,class T&gt;&#10;class (:link </string>
+													<string>[@template &lt;class T&gt;&#10;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -4442,7 +4431,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:);@]&#10;</string>
+													<string>:)( T const &amp; e );@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4453,7 +4442,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class Tag,class T&gt;&#10;class (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:);@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4463,6 +4463,17 @@
 														<id>-16</id>
 													</shared_ptr>
 												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-17</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>7</size>
 													<variant>2</variant>
@@ -4471,7 +4482,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-16</id>
+															<id>-17</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4480,7 +4491,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-16</id>
+															<id>-17</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4496,17 +4507,6 @@
 													<string>:) const &amp; x );@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-17</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -4537,7 +4537,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-20</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( T const &amp; x );@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4548,18 +4559,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@typedef T (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;m&quot;:);@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -4570,18 +4570,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
+													<size>19</size>
 													<variant>2</variant>
-													<string>[@(:link </string>
+													<string>[@#if !defined( BOOST_EXCEPTION_DISABLE )&#10;    #include &lt;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-21</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string> mod=&quot;m&quot;:) const &amp; (:link </string>
+													<string>:)&gt;&#10;    #include &lt;boost/current_function.hpp&gt;&#10;    #define (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -4590,7 +4590,70 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string> mod=&quot;m&quot;:)() const;@]&#10;</string>
+													<string>:)(x)\&#10;        ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-20</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)(x) &lt;&lt;\&#10;        ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-6</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|throw_function:)(BOOST_CURRENT_FUNCTION) &lt;&lt;\&#10;        ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-6</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|throw_file:)(__FILE__) &lt;&lt;\&#10;        ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-6</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|throw_line:)((int)__LINE__) )&#10;#else&#10;    #define (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-22</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)(x) ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)(x)&#10;#endif@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4601,18 +4664,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
+													<size>3</size>
 													<variant>2</variant>
-													<string>[@template &lt;class ErrorInfo,class E&gt;&#10;typename ErrorInfo::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;m&quot;:) const * (:link </string>
+													<string>[@typedef T (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -4621,7 +4675,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)( E const &amp; x );@]&#10;</string>
+													<string> mod=&quot;m&quot;:);@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4632,7 +4686,27 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-23</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> mod=&quot;m&quot;:) const &amp; (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-24</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> mod=&quot;m&quot;:)() const;@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4654,9 +4728,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
+													<size>5</size>
 													<variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
+													<string>[@template &lt;class ErrorInfo,class E&gt;&#10;typename ErrorInfo::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-23</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> mod=&quot;m&quot;:) const * (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -4665,7 +4748,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)( T const &amp; x );@]&#10;</string>
+													<string>:)( E const &amp; x );@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4687,27 +4770,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@class&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:):&#10;    public std::exception&#10;    public boost::</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-50</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&#10;    {&#10;    ---unspecified---&#10;    };@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -4718,7 +4781,27 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@void (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-29</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const &amp; ep );</string>
 												</container>
 											</pair>
 											<pair>
@@ -4740,9 +4823,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
+													<size>5</size>
 													<variant>2</variant>
-													<string>[@template &lt;class E&gt;&#10;std::string (:link </string>
+													<string>[@class&#10;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -4751,7 +4834,16 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)( E const &amp; e );@]&#10;</string>
+													<string>:):&#10;    public std::exception&#10;    public boost::</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-50</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&#10;    {&#10;    ---unspecified---&#10;    };@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4761,111 +4853,6 @@
 														<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>
-												<container>
-													<size>19</size>
-													<variant>2</variant>
-													<string>[@#if !defined( BOOST_EXCEPTION_DISABLE )&#10;    #include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;    #include &lt;boost/current_function.hpp&gt;&#10;    #define (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)(x)\&#10;        ::boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-36</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( ::boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)(x) &lt;&lt;\&#10;        ::boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|throw_function:)(BOOST_CURRENT_FUNCTION) &lt;&lt;\&#10;        ::boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|throw_file:)(__FILE__) &lt;&lt;\&#10;        ::boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|throw_line:)((int)__LINE__) )&#10;#else&#10;    #define (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)(x) ::boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-36</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)(x)&#10;#endif@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
-													</shared_ptr>
-												</weak_ptr>
 												<container>
 													<size>3</size>
 													<variant>2</variant>
@@ -4874,7 +4861,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -4885,113 +4872,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)();@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@#ifdef BOOST_NO_EXCEPTIONS&#10;    void (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-36</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( std::exception const &amp; e ); // user defined&#10;#else&#10;    template &lt;class E&gt;&#10;    void (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-36</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( E const &amp; e );&#10;#endif@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-37</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-37</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;m&quot;:)();@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-38</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( T const &amp; e );@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-39</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -5002,13 +4883,159 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-35</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
+													<variant>2</variant>
+													<string>[@template &lt;class E&gt;&#10;std::string (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-35</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( E const &amp; e );&#10;&#10;std::string (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-35</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> const &amp; p );@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-36</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-37</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
 													<size>5</size>
 													<variant>2</variant>
-													<string>[@void (:link </string>
+													<string>[@(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-37</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)();@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@#ifdef BOOST_NO_EXCEPTIONS&#10;    void (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( std::exception const &amp; e ); // user defined&#10;#else&#10;    template &lt;class E&gt;&#10;    void (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( E const &amp; e );&#10;#endif@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-39</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-39</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> mod=&quot;m&quot;:)();@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-40</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -5017,16 +5044,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)( (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) const &amp; ep );</string>
+													<string>:)( T const &amp; e );@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -5086,7 +5104,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-21</id>
+															<id>-23</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5150,7 +5168,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5159,7 +5177,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5234,7 +5252,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5383,6 +5401,55 @@
 														<id>-5</id>
 													</shared_ptr>
 												</weak_ptr>
+												<container>
+													<size>9</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;This </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> typedef is used by </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-37</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> if it defaults to returning an </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> that refers to an object of type </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-31</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>, to record in it the std::type_info of the original exception object.</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-6</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>1</size>
 													<variant>2</variant>
@@ -5393,7 +5460,20 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-6</id>
+														<id>-7</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>-8</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -5422,7 +5502,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5440,7 +5520,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5512,7 +5592,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5530,7 +5610,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5539,7 +5619,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5548,7 +5628,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5557,7 +5637,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5566,7 +5646,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5575,7 +5655,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5584,7 +5664,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5602,7 +5682,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5620,7 +5700,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5629,7 +5709,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5638,7 +5718,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5656,7 +5736,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5694,7 +5774,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-7</id>
+														<id>-9</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -5734,7 +5814,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-8</id>
+														<id>-10</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -5743,32 +5823,6 @@
 													<string>(:auto !!:)&#10;&#10;(:pagelist fmt=&quot;index&quot; tags=&quot;hpp&quot; sort_prefix=&quot;6&quot;:)&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-9</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>-10</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>
@@ -5777,45 +5831,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>9</size>
+													<size>1</size>
 													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;This </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> typedef is used by </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> if it defaults to returning an </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> that refers to an object of type </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>, to record in it the std::type_info of the original exception object.</string>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -5826,27 +5844,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
+													<size>1</size>
 													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if&#10;&#10;[@try&#10;    {&#10;    throw </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>(e);&#10;    }&#10;catch(...)&#10;    {&#10;    return (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)();&#10;    }@]&#10;</string>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -5869,6 +5869,37 @@
 														<id>-14</id>
 													</shared_ptr>
 												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if&#10;&#10;[@try&#10;    {&#10;    throw </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-40</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>(e);&#10;    }&#10;catch(...)&#10;    {&#10;    return (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-37</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)();&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-15</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>37</size>
 													<variant>2</variant>
@@ -5877,7 +5908,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5904,7 +5935,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-5</id>
+															<id>-7</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5913,7 +5944,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5922,7 +5953,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-5</id>
+															<id>-7</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5931,7 +5962,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5940,7 +5971,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-5</id>
+															<id>-7</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5949,7 +5980,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5967,7 +5998,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -5994,7 +6025,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6030,7 +6061,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6041,7 +6072,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-15</id>
+														<id>-16</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6054,7 +6085,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-16</id>
+														<id>-17</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6094,7 +6125,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-17</id>
+														<id>-18</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6105,7 +6136,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6114,7 +6145,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6132,7 +6163,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-18</id>
+															<id>-19</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6141,7 +6172,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-41</id>
+															<id>-42</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6152,7 +6183,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-18</id>
+														<id>-19</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6163,7 +6194,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6181,7 +6212,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6190,7 +6221,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6206,19 +6237,6 @@
 													<string>:).&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-19</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>
@@ -6226,183 +6244,6 @@
 														<id>-20</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>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Definition:&#10;&#10;The expression </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&lt;Tag,T&gt;::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;m&quot;:) evaluates to T.</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-22</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Description:&#10;&#10;Returns a const reference to the copy of the value passed to (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&apos;s constructor stored in the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) object.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-23</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>13</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;* ErrorInfo must be an instance of the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) template.&#10;* E must be polymorphic.&#10;&#10;!!!!Returns:&#10;&#10;* If dynamic_cast&lt;boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-50</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) const *&gt;(&amp;x) is 0, or if x does not store an object of type ErrorInfo, the returned value is null.&#10;* Otherwise, the returned pointer points to the stored value (use (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-52</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;/&quot;:) to store values in exception objects.) When x is destroyed, any pointers returned by (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-23</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) become invalid.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The interface of (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-23</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) may be affected by the build (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-32</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:).&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-24</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>-25</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>!!!!Example:&#10;&#10;this is a possible output from the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-31</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) function, as used in &apos;&apos;libs/exception/example/example_io.cpp:&apos;&apos;&#10;&#10;[@example_io.cpp(83): Throw in function class boost::shared_ptr&lt;struct _iobuf&gt; __cdecl my_fopen(const char *,const char *)&#10;Dynamic exception type: class boost::exception_detail::clone_impl&lt;class fopen_error&gt;&#10;std::exception::what: example_io error&#10;[struct tag_errno *] = 2, OS says &quot;No such file or directory&quot;&#10;[struct tag_file_name *] = tmp1.txt&#10;[struct tag_function *] = fopen&#10;[struct tag_open_mode *] = rb@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-26</id>
-													</shared_ptr>
-												</weak_ptr>
 												<container>
 													<size>5</size>
 													<variant>2</variant>
@@ -6427,6 +6268,201 @@
 													<string>:). The T sub-object is initialized from x by the T copy constructor.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-21</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>-22</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;This macro takes an exception object, records BOOST_CURRENT_FUNCTION, __FILE__ and __LINE__ in it, and forwards it to </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>. To recover this information at the catch site, use </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>; the information is also included in the message returned by </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-35</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-23</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Definition:&#10;&#10;The expression </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&lt;Tag,T&gt;::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-23</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> mod=&quot;m&quot;:) evaluates to T.</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-24</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Description:&#10;&#10;Returns a const reference to the copy of the value passed to (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&apos;s constructor stored in the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) object.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-25</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>-26</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>13</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;* ErrorInfo must be an instance of the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) template.&#10;* E must be polymorphic.&#10;&#10;!!!!Returns:&#10;&#10;* If dynamic_cast&lt;boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-50</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const *&gt;(&amp;x) is 0, or if x does not store an object of type ErrorInfo, the returned value is null.&#10;* Otherwise, the returned pointer points to the stored value (use (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-52</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> mod=&quot;/&quot;:) to store values in exception objects.) When x is destroyed, any pointers returned by (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) become invalid.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The interface of (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) may be affected by the build (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:).&#10;</string>
+												</container>
+											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -6434,6 +6470,54 @@
 														<id>-27</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>-28</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>!!!!Example:&#10;&#10;this is a possible output from the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-35</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) function, as used in &apos;&apos;libs/exception/example/example_io.cpp:&apos;&apos;&#10;&#10;[@example_io.cpp(83): Throw in function class boost::shared_ptr&lt;struct _iobuf&gt; __cdecl my_fopen(const char *,const char *)&#10;Dynamic exception type: class boost::exception_detail::clone_impl&lt;class fopen_error&gt;&#10;std::exception::what: example_io error&#10;[struct tag_errno *] = 2, OS says &quot;No such file or directory&quot;&#10;[struct tag_file_name *] = tmp1.txt&#10;[struct tag_function *] = fopen&#10;[struct tag_open_mode *] = rb@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-29</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Precondition:&#10;&#10;ep shall not be null.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;The exception to which ep refers.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-30</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>17</size>
 													<variant>2</variant>
@@ -6442,7 +6526,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6451,7 +6535,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6469,7 +6553,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6496,7 +6580,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6505,7 +6589,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6516,7 +6600,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
+														<id>-31</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6527,7 +6611,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6536,7 +6620,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6547,7 +6631,128 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-32</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>25</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;The (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) type can be used to refer to a copy of an exception object. It is Default Constructible, Copy Constructible, Assignable and Equality Comparable; (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&apos;s operations do not throw.&#10;&#10;The referenced object remains valid at least as long as there is an (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) object that refers to it.&#10;&#10;Two instances of (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) are equivalent and compare equal if and only if they refer to the same exception.&#10;&#10;The default constructor of (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) produces the null value of the type. The null value is equivalent only to itself.&#10;&#10;!!!!Thread safety&#10;&#10;* It is legal for multiple threads to hold (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) references to the same exception object.&#10;* It is illegal for multiple threads to modify the same (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) object concurrently.&#10;* While calling (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-37</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) makes a copy of the current exception object, it is still possible for the two copies to share internal state. Therefore, in general it is not safe to call (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-29</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) concurrently to throw the same exception object into multiple threads.&#10;&#10;!!!!Nesting of exceptions:&#10;&#10;An (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) can be added as (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) to any boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-50</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:). This is a convenient way to nest exceptions. There is no limit on the depth of the nesting, however cyclic references result in undefined behavior.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6560,7 +6765,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-30</id>
+														<id>-34</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6571,7 +6776,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6607,7 +6812,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6634,7 +6839,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6643,7 +6848,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-25</id>
+															<id>-28</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6654,13 +6859,13 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-31</id>
+														<id>-35</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>29</size>
+													<size>37</size>
 													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;A string value that contains varying amount of implementation-specific diagnostic information about the passed exception object:&#10;&#10;*If E can be statically converted to boost::(:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;A string value that contains varying amount of implementation-specific diagnostic information about the passed object:&#10;&#10;*If E can be statically converted to boost::(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -6674,7 +6879,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6705,21 +6910,21 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:);&#10;**otherwise the returned value contains the what() string.&#10;*Otherwise, the boost::</string>
+													<string>:);&#10;**otherwise the returned value contains the what() string.&#10;*Otherwise, the boost::(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string> template is not available.&#10;&#10;The string representation of each (:link </string>
+													<string>:) template is not available.&#10;&#10;The string representation of each (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6728,7 +6933,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6737,7 +6942,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6746,7 +6951,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-22</id>
+															<id>-24</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6755,7 +6960,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-22</id>
+															<id>-24</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6764,7 +6969,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6773,27 +6978,63 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:) object to string, and &apos;&apos;an unspecified stub string value is used without issuing a compile error.&apos;&apos;&#10;&#10;!!!!Notes:&#10;&#10;*The format of the returned string is unspecified.&#10;*The returned string is &apos;&apos;not&apos;&apos; user-friendly.&#10;*The returned string may include additional platform-specific diagnostic information.&#10;&#10;(:include </string>
+													<string>:) object to string, and &apos;&apos;an unspecified stub string value is used without issuing a compile error.&apos;&apos;&#10;&#10;The </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-25</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)</string>
+													<string> overload of </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-35</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> is equivalent to:&#10;&#10;[@if( p )&#10;    try&#10;        {&#10;        </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-29</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>(p);&#10;        }&#10;    catch(...)&#10;        {&#10;        return </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-60</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>();&#10;        }&#10;else return &lt;unspecified-string-value&gt;;@]&#10;&#10;!!!!Notes:&#10;&#10;*The format of the returned string is unspecified.&#10;*The returned string is &apos;&apos;not&apos;&apos; user-friendly.&#10;*The returned string may include additional platform-specific diagnostic information.&#10;&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-28</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-32</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6804,7 +7045,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6813,7 +7054,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6831,7 +7072,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6840,7 +7081,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6849,7 +7090,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6858,7 +7099,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-10</id>
+															<id>-12</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6867,7 +7108,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6876,7 +7117,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -6887,168 +7128,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;This macro takes an exception object, records BOOST_CURRENT_FUNCTION, __FILE__ and __LINE__ in it, and forwards it to </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-36</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>. To recover this information at the catch site, use </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-23</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>; the information is also included in the message returned by </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-31</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>25</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;The (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) type can be used to refer to a copy of an exception object. It is Default Constructible, Copy Constructible, Assignable and Equality Comparable; (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&apos;s operations do not throw.&#10;&#10;The referenced object remains valid at least as long as there is an (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) object that refers to it.&#10;&#10;Two instances of (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) are equivalent and compare equal if and only if they refer to the same exception.&#10;&#10;The default constructor of (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) produces the null value of the type. The null value is equivalent only to itself.&#10;&#10;!!!!Thread safety&#10;&#10;* It is legal for multiple threads to hold (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) references to the same exception object.&#10;* It is illegal for multiple threads to modify the same (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) object concurrently.&#10;* While calling (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) makes a copy of the current exception object, it is still possible for the two copies to share internal state. Therefore, in general it is not safe to call (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-40</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) concurrently to throw the same exception object into multiple threads.&#10;&#10;!!!!Nesting of exceptions:&#10;&#10;An (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) can be added as (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) to any boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-50</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:). This is a convenient way to nest exceptions. There is no limit on the depth of the nesting, however cyclic references result in undefined behavior.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-35</id>
+														<id>-37</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7059,7 +7139,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7068,7 +7148,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7077,7 +7157,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7086,7 +7166,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7095,7 +7175,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7104,7 +7184,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7113,7 +7193,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7122,7 +7202,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7131,7 +7211,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-28</id>
+															<id>-31</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7167,7 +7247,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7185,7 +7265,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7194,7 +7274,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-11</id>
+															<id>-5</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7205,7 +7285,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-36</id>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7216,7 +7296,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7225,7 +7305,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7234,7 +7314,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7243,7 +7323,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7252,7 +7332,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7261,7 +7341,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7270,7 +7350,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7279,7 +7359,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7290,7 +7370,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-37</id>
+														<id>-39</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7312,7 +7392,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7323,7 +7403,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7332,7 +7412,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7341,7 +7421,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7350,7 +7430,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7359,7 +7439,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7368,7 +7448,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-28</id>
+															<id>-31</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7377,7 +7457,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7386,7 +7466,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7404,7 +7484,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7415,7 +7495,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-39</id>
+														<id>-41</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7426,7 +7506,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-9</id>
+															<id>-11</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7435,7 +7515,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7444,7 +7524,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7453,7 +7533,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7471,7 +7551,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7482,20 +7562,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Precondition:&#10;&#10;ep shall not be null.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;The exception to which ep refers.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-41</id>
+														<id>-42</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7506,7 +7573,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7515,7 +7582,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7542,7 +7609,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7551,7 +7618,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7560,7 +7627,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7569,7 +7636,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7578,7 +7645,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-40</id>
+															<id>-29</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7587,7 +7654,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7596,7 +7663,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-40</id>
+															<id>-29</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7605,7 +7672,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7614,7 +7681,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7623,7 +7690,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-38</id>
+															<id>-40</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7632,7 +7699,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7641,7 +7708,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-28</id>
+															<id>-31</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7650,7 +7717,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7659,26 +7726,13 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-40</id>
+															<id>-29</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
 													<string>:) in the above examples is well-formed.&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-42</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>
@@ -7707,7 +7761,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7738,7 +7792,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-7</id>
+															<id>-9</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7760,7 +7814,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7769,7 +7823,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7778,7 +7832,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-5</id>
+															<id>-7</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7787,7 +7841,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-5</id>
+															<id>-7</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7796,7 +7850,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7805,7 +7859,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7814,7 +7868,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-9</id>
+															<id>-11</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7823,7 +7877,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-9</id>
+															<id>-11</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7832,7 +7886,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-24</id>
+															<id>-27</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7841,7 +7895,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-24</id>
+															<id>-27</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7850,7 +7904,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-15</id>
+															<id>-16</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7859,7 +7913,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-15</id>
+															<id>-16</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7922,7 +7976,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-10</id>
+															<id>-12</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7931,7 +7985,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-10</id>
+															<id>-12</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7940,7 +7994,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7949,7 +8003,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7980,7 +8034,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -7998,7 +8052,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8007,7 +8061,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8016,7 +8070,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8025,7 +8079,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8034,7 +8088,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8043,7 +8097,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8150,7 +8204,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-27</id>
+															<id>-30</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8168,7 +8222,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-39</id>
+															<id>-41</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8208,7 +8262,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8235,7 +8289,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8266,7 +8320,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8275,7 +8329,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8293,7 +8347,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-20</id>
+															<id>-21</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8302,7 +8356,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8369,7 +8423,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8474,7 +8528,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8501,7 +8555,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8555,7 +8609,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8564,7 +8618,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8573,7 +8627,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8582,7 +8636,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8613,7 +8667,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-17</id>
+															<id>-18</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8622,7 +8676,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8658,7 +8712,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-17</id>
+															<id>-18</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8667,7 +8721,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-7</id>
+															<id>-9</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8685,7 +8739,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-30</id>
+															<id>-34</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8703,7 +8757,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8712,7 +8766,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8721,7 +8775,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-14</id>
+															<id>-15</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8748,7 +8802,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-23</id>
+															<id>-26</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8757,7 +8811,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-20</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8766,34 +8820,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;###(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;###(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;###(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-12</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8811,7 +8838,34 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-28</id>
+															<id>-37</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;###(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-14</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;###(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-29</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;###(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-31</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8820,7 +8874,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8856,7 +8910,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-8</id>
+															<id>-10</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8883,7 +8937,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-29</id>
+															<id>-33</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8892,7 +8946,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-32</id>
+															<id>-36</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8901,7 +8955,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-6</id>
+															<id>-8</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -8941,7 +8995,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-31</id>
+															<id>-35</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -9648,9 +9702,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>1</size>
+													<size>3</size>
 													<variant>2</variant>
-													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>`#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-53</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -9661,7 +9724,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<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>
@@ -9672,7 +9737,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<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>
@@ -9694,18 +9761,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-42</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;#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>
@@ -9716,9 +9772,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include api:)&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -9731,16 +9785,16 @@
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>`#include &lt;</string>
+													<string>[@#include &lt;</string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-53</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;#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>
@@ -9751,18 +9805,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
+													<size>1</size>
 													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-53</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>(:include api:)&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -9793,7 +9838,29 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-53</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-15</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -9804,7 +9871,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-15</id>
+														<id>-16</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -9822,17 +9889,6 @@
 													<string> decl pre_indent=&quot;4&quot;:)&#10;&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-16</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -9863,9 +9919,7 @@
 													</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>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -9875,34 +9929,34 @@
 														<id>-20</id>
 													</shared_ptr>
 												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-21</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>1</size>
 													<variant>2</variant>
 													<string>[@(:include api:)@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-42</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@(:include decl:)@]&#10;</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -9913,16 +9967,16 @@
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>`#include &lt;</string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-12</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@(:include decl:)@]&#10;</string>
+													<string>&gt;&#10;&#10;(:include decl:)&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -9933,9 +9987,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>1</size>
+													<size>3</size>
 													<variant>2</variant>
-													<string>[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-25</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@(:include decl:)@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -9948,16 +10011,16 @@
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>[@#include &lt;</string>
+													<string>`#include &lt;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;&#10;&#10;[@(:include decl:)@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -9968,7 +10031,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-6</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -9979,18 +10053,9 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
+													<size>1</size>
 													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-24</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10001,7 +10066,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-6</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10011,6 +10087,17 @@
 														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-29</id>
+													</shared_ptr>
+												</weak_ptr>
 												<container>
 													<size>3</size>
 													<variant>2</variant>
@@ -10026,17 +10113,6 @@
 													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-29</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -10063,11 +10139,11 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-15</id>
+															<id>-53</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10077,39 +10153,6 @@
 														<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>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-10</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;&#10;(:include decl:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
-													</shared_ptr>
-												</weak_ptr>
 												<container>
 													<size>3</size>
 													<variant>2</variant>
@@ -10125,6 +10168,28 @@
 													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
+											<pair>
+												<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>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -10140,11 +10205,11 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-53</id>
+															<id>-16</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10155,18 +10220,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#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;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl:)&#10;    }@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -10177,7 +10231,18 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-53</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10190,16 +10255,16 @@
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>`#include &lt;</string>
+													<string>`#include &lt;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-55</id>
+															<id>-12</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10223,16 +10288,16 @@
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>`#include &lt;</string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-53</id>
+															<id>-55</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -10254,18 +10319,7 @@
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
@@ -10294,7 +10348,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10349,7 +10403,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-9</id>
+															<id>-11</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10391,7 +10445,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10424,7 +10478,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-25</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10446,7 +10500,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10490,7 +10544,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-19</id>
+															<id>-6</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10558,7 +10612,7 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-15</id>
+															<id>-16</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
@@ -10801,7 +10855,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-17</id>
+										<id>-18</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -10852,7 +10906,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-24</id>
+										<id>-27</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -10920,41 +10974,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-7</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>0</size>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>1</empty>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-6</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>0</size>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>1</empty>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-43</id>
+										<id>-9</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -10974,6 +10994,40 @@
 										<id>-8</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>0</size>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>1</empty>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-43</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>0</size>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>1</empty>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-10</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -11005,7 +11059,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-29</id>
+										<id>-33</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11046,7 +11100,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-15</id>
+										<id>-16</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11098,7 +11152,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-28</id>
+										<id>-31</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11126,7 +11180,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-35</id>
+										<id>-37</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11154,7 +11208,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-34</id>
+										<id>-32</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11182,7 +11236,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-11</id>
+										<id>-5</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11210,7 +11264,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-40</id>
+										<id>-29</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11238,7 +11292,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-12</id>
+										<id>-14</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11262,7 +11316,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-41</id>
+										<id>-42</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11286,7 +11340,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-25</id>
+										<id>-28</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11422,7 +11476,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-23</id>
+										<id>-26</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11450,7 +11504,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-31</id>
+										<id>-35</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11502,7 +11556,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-30</id>
+										<id>-34</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11526,7 +11580,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-20</id>
+										<id>-21</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11550,7 +11604,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-27</id>
+										<id>-30</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11578,7 +11632,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-36</id>
+										<id>-38</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11610,7 +11664,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-32</id>
+										<id>-36</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11662,7 +11716,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-14</id>
+										<id>-15</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11694,7 +11748,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-21</id>
+										<id>-23</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11726,7 +11780,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-22</id>
+										<id>-24</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11774,7 +11828,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-42</id>
+										<id>-25</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11798,7 +11852,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-19</id>
+										<id>-6</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11826,7 +11880,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-37</id>
+										<id>-39</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11854,7 +11908,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-38</id>
+										<id>-40</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11882,7 +11936,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-26</id>
+										<id>-20</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11942,7 +11996,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-16</id>
+										<id>-17</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11966,7 +12020,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-9</id>
+										<id>-11</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -11990,7 +12044,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-18</id>
+										<id>-19</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -12014,7 +12068,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-33</id>
+										<id>-22</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -12038,7 +12092,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-10</id>
+										<id>-12</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -12090,7 +12144,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-5</id>
+										<id>-7</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -12142,7 +12196,7 @@
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-39</id>
+										<id>-41</id>
 									</shared_ptr>
 								</pair>
 							</sorted>
@@ -12173,13 +12227,13 @@
 											<id>-5</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string></string>
+									<string>type</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-9</id>
+											<id>-6</id>
 										</shared_ptr>
 									</weak_ptr>
 									<string></string>
@@ -12188,7 +12242,7 @@
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-10</id>
+											<id>-7</id>
 										</shared_ptr>
 									</weak_ptr>
 									<string></string>
@@ -12200,7 +12254,7 @@
 											<id>-11</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>type</string>
+									<string></string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12209,7 +12263,7 @@
 											<id>-12</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception_ptr free function</string>
+									<string></string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12227,7 +12281,7 @@
 											<id>-14</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>type</string>
+									<string>exception_ptr free function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12236,7 +12290,7 @@
 											<id>-15</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string></string>
+									<string>type</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12245,7 +12299,7 @@
 											<id>-16</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>function</string>
+									<string></string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12254,7 +12308,7 @@
 											<id>-17</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>tutorial</string>
+									<string>function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12263,7 +12317,7 @@
 											<id>-18</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>noindex tutorial</string>
+									<string>tutorial</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12272,7 +12326,7 @@
 											<id>-19</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string></string>
+									<string>noindex tutorial</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12281,7 +12335,7 @@
 											<id>-20</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string></string>
+									<string>error_info free function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12290,7 +12344,7 @@
 											<id>-21</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>type</string>
+									<string></string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12299,7 +12353,7 @@
 											<id>-22</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>function member</string>
+									<string>macro</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12308,7 +12362,7 @@
 											<id>-23</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>error_info free function</string>
+									<string>type</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12317,7 +12371,16 @@
 											<id>-24</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>error_info</string>
+									<string>function member</string>
+								</pair>
+								<pair>
+									<weak_ptr>
+										<expired>0</expired>
+										<shared_ptr>
+											<id>-25</id>
+										</shared_ptr>
+									</weak_ptr>
+									<string></string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12335,16 +12398,16 @@
 											<id>-27</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>error_info</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-28</id>
+											<id>-29</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception_ptr type</string>
+									<string>exception_ptr free function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12353,7 +12416,7 @@
 											<id>-30</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>diagnostic_information tutorial</string>
+									<string>noalso noindex tutorial</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12362,22 +12425,13 @@
 											<id>-31</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>diagnostic_information free function</string>
+									<string>exception_ptr type</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-33</id>
-										</shared_ptr>
-									</weak_ptr>
-									<string>macro</string>
-								</pair>
-								<pair>
-									<weak_ptr>
-										<expired>0</expired>
-										<shared_ptr>
-											<id>-34</id>
+											<id>-32</id>
 										</shared_ptr>
 									</weak_ptr>
 									<string>type</string>
@@ -12386,19 +12440,19 @@
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-35</id>
+											<id>-34</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>diagnostic_information tutorial</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-36</id>
+											<id>-35</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>free function</string>
+									<string>diagnostic_information free function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12407,7 +12461,7 @@
 											<id>-37</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>function</string>
+									<string>exception_ptr free function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12416,7 +12470,7 @@
 											<id>-38</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>free function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12425,7 +12479,7 @@
 											<id>-39</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12443,7 +12497,7 @@
 											<id>-41</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>noindex tutorial</string>
+									<string>noalso noindex tutorial</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -12452,7 +12506,7 @@
 											<id>-42</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string></string>
+									<string>noindex tutorial</string>
 								</pair>
 								<pair>
 									<weak_ptr>
diff --git a/doc/synopsis.html b/doc/synopsis.html
index 2cfce46..c617031 100644
--- a/doc/synopsis.html
+++ b/doc/synopsis.html
@@ -102,7 +102,9 @@ boost
 <span class="RenoIncludeSPAN">    class <span class="RenoLink"><a href="exception.html">exception</a></span>;</span>
 
 <span class="RenoIncludeSPAN">    <span class="RenoIncludeSPAN">template &lt;class E&gt;
-    std::string <span class="RenoLink"><a href="diagnostic_information.html">diagnostic_information</a></span>( E const &amp; e );</span>    
+    std::string <span class="RenoLink"><a href="diagnostic_information.html">diagnostic_information</a></span>( E const &amp; e );
+    
+    std::string <span class="RenoLink"><a href="diagnostic_information.html">diagnostic_information</a></span>( <span class="RenoLink"><a href="exception_ptr.html">exception_ptr</a></span> const &amp; p );</span>    
     
     <span class="RenoIncludeSPAN">std::string <span class="RenoLink"><a href="current_exception_diagnostic_information.html">current_exception_diagnostic_information</a></span>();</span></span>
     }</span></pre>