diff --git a/doc/source/boost-exception.reno b/doc/source/boost-exception.reno
index 6ba1694..5fd08e4 100644
--- a/doc/source/boost-exception.reno
+++ b/doc/source/boost-exception.reno
@@ -179,14 +179,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>3</size>
-																			<strong>073C70F0D1C27474AB493044E52FFE0D1C3295AE64271A3810FE4EAADF180FF8</strong>
-																			<weak>4147382513</weak>
-																			<size>1041</size>
+																			<strong>99DDC29B8C4D366F7A5A5819117AF190E5255231DD9313E1CC0D56BCD9D89BAA</strong>
+																			<weak>2051148095</weak>
+																			<size>1039</size>
 																			<position>548</position>
-																			<strong>5D5B59DE2E0728CF19BDD22BF7DE3FADAD08B422B577E0705508F6D9FB6707C7</strong>
-																			<weak>387228411</weak>
-																			<size>623</size>
-																			<position>412</position>
+																			<strong>12EE98255E53951EE44D5D95A0506693E9F5F9D371505F490B8C0676EB383C7C</strong>
+																			<weak>2825495330</weak>
+																			<size>622</size>
+																			<position>411</position>
 																			<strong>38B566F2C6678B8724D18086A6F76E077DC2ADC1BB69A4B83BF0A2C3B7D31B50</strong>
 																			<weak>2218658069</weak>
 																			<size>31</size>
@@ -232,9 +232,9 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>1</size>
-																			<strong>68C66297C6264EA69A6D19027C04B5113B3061648DA859BD91CB456B0A0526F8</strong>
-																			<weak>905703606</weak>
-																			<size>11839</size>
+																			<strong>58091DC5EBEE7F90249253E3177232040F23E5D75F6530A54041D93DBFE99291</strong>
+																			<weak>2889971768</weak>
+																			<size>11308</size>
 																			<position>321</position>
 																		</container>
 																	</stream_hook_path>
@@ -277,9 +277,9 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-																			<weak>3664841048</weak>
-																			<size>11133</size>
+																			<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+																			<weak>2285342938</weak>
+																			<size>10602</size>
 																			<position>927</position>
 																			<strong>44A436E88E9302D907AF1F343063D988F0F87C863E372EA97378835C64480093</strong>
 																			<weak>308353940</weak>
@@ -512,14 +512,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-																			<weak>3664841048</weak>
-																			<size>11133</size>
+																			<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+																			<weak>2285342938</weak>
+																			<size>10602</size>
 																			<position>927</position>
-																			<strong>B86F5C0A69B3847A8FC514C61F1DF8EA5DAFFDEC2748F6FD3494198D3741ABC7</strong>
-																			<weak>639423670</weak>
-																			<size>901</size>
-																			<position>8905</position>
+																			<strong>796BD0D716259ADB3173AFA2A7989E3F52F5D007D67D132DE95A080801510B50</strong>
+																			<weak>1299192030</weak>
+																			<size>7151</size>
+																			<position>2124</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -694,7 +694,7 @@
 																			<strong>964F6A1CDF157430B6F65ABDD6A590CFA6AE83EAED66B5B59BA829DB07DF97F2</strong>
 																			<weak>3653363251</weak>
 																			<size>731</size>
-																			<position>735</position>
+																			<position>780</position>
 																			<strong>36688510914673386A7870D1D4970B7D74CF9A4B7226F9E225A5607DCBFB12C4</strong>
 																			<weak>2314308857</weak>
 																			<size>446</size>
@@ -830,13 +830,13 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>04DB2E0229B4E66C2DCC8265F1A03E78A571548BB34D1371D35EDB8149A7F806</strong>
-																			<weak>546881876</weak>
-																			<size>3807</size>
-																			<position>1476</position>
-																			<strong>FEFF55B78626A9BF729269CF569A8D372BDAE94D23C1C666CBC3ACCE0E13A6AA</strong>
-																			<weak>2482779682</weak>
-																			<size>3283</size>
+																			<strong>C58F3DFE2F3E99070B5C0982BD1A9101B6C9E56901A8E276EFA131B3F131F12C</strong>
+																			<weak>1482082928</weak>
+																			<size>3832</size>
+																			<position>1521</position>
+																			<strong>04DC5F51958DAE2FB24D3C430AA74E860FD42BFA204D223723B77B11656CB159</strong>
+																			<weak>1496465214</weak>
+																			<size>3308</size>
 																			<position>26</position>
 																		</container>
 																	</stream_hook_path>
@@ -973,14 +973,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-																			<weak>3664841048</weak>
-																			<size>11133</size>
+																			<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+																			<weak>2285342938</weak>
+																			<size>10602</size>
 																			<position>927</position>
 																			<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
 																			<weak>3624753243</weak>
 																			<size>279</size>
-																			<position>103</position>
+																			<position>177</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -1294,14 +1294,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-																			<weak>3664841048</weak>
-																			<size>11133</size>
+																			<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+																			<weak>2285342938</weak>
+																			<size>10602</size>
 																			<position>927</position>
 																			<strong>F65C82C62C1EEA672C42FE46189491942DE15B2F8C998E7CAE49588C7D8CBFFA</strong>
 																			<weak>1041900763</weak>
 																			<size>143</size>
-																			<position>10115</position>
+																			<position>9584</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -1388,18 +1388,18 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>3</size>
-																			<strong>073C70F0D1C27474AB493044E52FFE0D1C3295AE64271A3810FE4EAADF180FF8</strong>
-																			<weak>4147382513</weak>
-																			<size>1041</size>
+																			<strong>99DDC29B8C4D366F7A5A5819117AF190E5255231DD9313E1CC0D56BCD9D89BAA</strong>
+																			<weak>2051148095</weak>
+																			<size>1039</size>
 																			<position>548</position>
-																			<strong>5D5B59DE2E0728CF19BDD22BF7DE3FADAD08B422B577E0705508F6D9FB6707C7</strong>
-																			<weak>387228411</weak>
-																			<size>623</size>
-																			<position>412</position>
-																			<strong>5EB718F617CB65548DFF259216ED67278E1B4EA43BF5605D242448780D8C477E</strong>
-																			<weak>68818004</weak>
-																			<size>97</size>
-																			<position>370</position>
+																			<strong>12EE98255E53951EE44D5D95A0506693E9F5F9D371505F490B8C0676EB383C7C</strong>
+																			<weak>2825495330</weak>
+																			<size>622</size>
+																			<position>411</position>
+																			<strong>98B33BE76679E3A4831241335CD5DFF6F634429F36BABF96C1D4DC2296C5ECC5</strong>
+																			<weak>1584672077</weak>
+																			<size>208</size>
+																			<position>259</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -1672,9 +1672,9 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>1</size>
-																			<strong>1922E0A161BF6AA0886BC01B3BBBB31AB7C50C55F1274209985A1EFB086FD8C7</strong>
-																			<weak>989285904</weak>
-																			<size>5062</size>
+																			<strong>5594B7B6271DE43F8A8783A856C365F0E2DDC193C9ED293DE67EC75F16C1ABAD</strong>
+																			<weak>3976881657</weak>
+																			<size>5132</size>
 																			<position>321</position>
 																		</container>
 																	</stream_hook_path>
@@ -2169,14 +2169,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>04DB2E0229B4E66C2DCC8265F1A03E78A571548BB34D1371D35EDB8149A7F806</strong>
-																			<weak>546881876</weak>
-																			<size>3807</size>
-																			<position>1476</position>
+																			<strong>C58F3DFE2F3E99070B5C0982BD1A9101B6C9E56901A8E276EFA131B3F131F12C</strong>
+																			<weak>1482082928</weak>
+																			<size>3832</size>
+																			<position>1521</position>
 																			<strong>5738DF31DB52E5E8784199058479E798957794147A099D834110FF821C605EE3</strong>
 																			<weak>1133216499</weak>
 																			<size>490</size>
-																			<position>3311</position>
+																			<position>3336</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -2365,14 +2365,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-																			<weak>3664841048</weak>
-																			<size>11133</size>
+																			<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+																			<weak>2285342938</weak>
+																			<size>10602</size>
 																			<position>927</position>
 																			<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
 																			<weak>2078296250</weak>
 																			<size>305</size>
-																			<position>9808</position>
+																			<position>9277</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -2506,14 +2506,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>073C70F0D1C27474AB493044E52FFE0D1C3295AE64271A3810FE4EAADF180FF8</strong>
-																			<weak>4147382513</weak>
-																			<size>1041</size>
+																			<strong>99DDC29B8C4D366F7A5A5819117AF190E5255231DD9313E1CC0D56BCD9D89BAA</strong>
+																			<weak>2051148095</weak>
+																			<size>1039</size>
 																			<position>548</position>
-																			<strong>5D5B59DE2E0728CF19BDD22BF7DE3FADAD08B422B577E0705508F6D9FB6707C7</strong>
-																			<weak>387228411</weak>
-																			<size>623</size>
-																			<position>412</position>
+																			<strong>12EE98255E53951EE44D5D95A0506693E9F5F9D371505F490B8C0676EB383C7C</strong>
+																			<weak>2825495330</weak>
+																			<size>622</size>
+																			<position>411</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -2732,9 +2732,9 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>1</size>
-																			<strong>64E81A46AD2B7E1AFE2718B02484CF9AFE7287CB1DF2CBFFE7B25B7D8D5FDBE3</strong>
-																			<weak>3361882888</weak>
-																			<size>5012</size>
+																			<strong>ED2BABEAAFC5425B304B6A58A6986D38DC1F249A2B29BA88C89475F517FDCE74</strong>
+																			<weak>4116923183</weak>
+																			<size>5011</size>
 																			<position>321</position>
 																		</container>
 																	</stream_hook_path>
@@ -3247,9 +3247,9 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>31BD07D599F004E6A0BBE5E1D4D521DCC57D3F1D79BA101D998FAB55CF04903D</strong>
-																			<weak>1623562038</weak>
-																			<size>4482</size>
+																			<strong>16DD00328E4AF76F11BFD52A1E16305E0A2513B0BEB9D2380645C364AD4A3C4D</strong>
+																			<weak>211195741</weak>
+																			<size>4481</size>
 																			<position>751</position>
 																			<strong>6E325144EF4F41FA3A225EB30729101382C4E99B3D6160E307311E4B4E641010</strong>
 																			<weak>1097215175</weak>
@@ -3296,14 +3296,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>31BD07D599F004E6A0BBE5E1D4D521DCC57D3F1D79BA101D998FAB55CF04903D</strong>
-																			<weak>1623562038</weak>
-																			<size>4482</size>
+																			<strong>16DD00328E4AF76F11BFD52A1E16305E0A2513B0BEB9D2380645C364AD4A3C4D</strong>
+																			<weak>211195741</weak>
+																			<size>4481</size>
 																			<position>751</position>
 																			<strong>B494F545ED1BD0502F8699D7059DC882495CC0D93A23CFA306E5F39BB14E4A97</strong>
 																			<weak>259300739</weak>
 																			<size>523</size>
-																			<position>3953</position>
+																			<position>3952</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -3345,14 +3345,14 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>2</size>
-																			<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-																			<weak>3664841048</weak>
-																			<size>11133</size>
+																			<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+																			<weak>2285342938</weak>
+																			<size>10602</size>
 																			<position>927</position>
-																			<strong>6B3B617AC518A2177BDB89656E726B4E4D79577E289130493A61BAE24FB64838</strong>
-																			<weak>3173127726</weak>
-																			<size>1101</size>
-																			<position>1103</position>
+																			<strong>1760DA943E0DCAE6DDB000F3C08D6E6F5F8AEDBBEAC7CAA84A2ED60BFA4B0E1A</strong>
+																			<weak>702729709</weak>
+																			<size>815</size>
+																			<position>1307</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -14706,62 +14706,6 @@
 										<id>-20</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>04DB2E0229B4E66C2DCC8265F1A03E78A571548BB34D1371D35EDB8149A7F806</strong>
-												<weak>546881876</weak>
-												<size>3807</size>
-												<position>1476</position>
-												<strong>FEFF55B78626A9BF729269CF569A8D372BDAE94D23C1C666CBC3ACCE0E13A6AA</strong>
-												<weak>2482779682</weak>
-												<size>3283</size>
-												<position>26</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/diagnostic_information.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-22</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>04DB2E0229B4E66C2DCC8265F1A03E78A571548BB34D1371D35EDB8149A7F806</strong>
-												<weak>546881876</weak>
-												<size>3807</size>
-												<position>1476</position>
-												<strong>5738DF31DB52E5E8784199058479E798957794147A099D834110FF821C605EE3</strong>
-												<weak>1133216499</weak>
-												<size>490</size>
-												<position>3311</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/diagnostic_information.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-51</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -14938,6 +14882,62 @@
 										<id>-64</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>C58F3DFE2F3E99070B5C0982BD1A9101B6C9E56901A8E276EFA131B3F131F12C</strong>
+												<weak>1482082928</weak>
+												<size>3832</size>
+												<position>1521</position>
+												<strong>04DC5F51958DAE2FB24D3C430AA74E860FD42BFA204D223723B77B11656CB159</strong>
+												<weak>1496465214</weak>
+												<size>3308</size>
+												<position>26</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/diagnostic_information.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-22</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>C58F3DFE2F3E99070B5C0982BD1A9101B6C9E56901A8E276EFA131B3F131F12C</strong>
+												<weak>1482082928</weak>
+												<size>3832</size>
+												<position>1521</position>
+												<strong>5738DF31DB52E5E8784199058479E798957794147A099D834110FF821C605EE3</strong>
+												<weak>1133216499</weak>
+												<size>490</size>
+												<position>3336</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/diagnostic_information.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-51</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -14990,14 +14990,38 @@
 										<id>-38</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>DB156E6A8ACB9FB90C8FB110FC25A5FEB14A619F82EEC47FF913373592E5CC3E</strong>
+												<weak>240075319</weak>
+												<size>6209</size>
+												<position>412</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../example/example_io.cpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-73</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
 											<container>
 												<size>2</size>
-												<strong>31BD07D599F004E6A0BBE5E1D4D521DCC57D3F1D79BA101D998FAB55CF04903D</strong>
-												<weak>1623562038</weak>
-												<size>4482</size>
+												<strong>16DD00328E4AF76F11BFD52A1E16305E0A2513B0BEB9D2380645C364AD4A3C4D</strong>
+												<weak>211195741</weak>
+												<size>4481</size>
 												<position>751</position>
 												<strong>6E325144EF4F41FA3A225EB30729101382C4E99B3D6160E307311E4B4E641010</strong>
 												<weak>1097215175</weak>
@@ -15023,14 +15047,14 @@
 										<stream_hook_path>
 											<container>
 												<size>2</size>
-												<strong>31BD07D599F004E6A0BBE5E1D4D521DCC57D3F1D79BA101D998FAB55CF04903D</strong>
-												<weak>1623562038</weak>
-												<size>4482</size>
+												<strong>16DD00328E4AF76F11BFD52A1E16305E0A2513B0BEB9D2380645C364AD4A3C4D</strong>
+												<weak>211195741</weak>
+												<size>4481</size>
 												<position>751</position>
 												<strong>B494F545ED1BD0502F8699D7059DC882495CC0D93A23CFA306E5F39BB14E4A97</strong>
 												<weak>259300739</weak>
 												<size>523</size>
-												<position>3953</position>
+												<position>3952</position>
 											</container>
 										</stream_hook_path>
 									</hook>
@@ -15046,30 +15070,6 @@
 										<id>-76</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>DB156E6A8ACB9FB90C8FB110FC25A5FEB14A619F82EEC47FF913373592E5CC3E</strong>
-												<weak>240075319</weak>
-												<size>6209</size>
-												<position>412</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../example/example_io.cpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-73</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -15470,6 +15470,30 @@
 										<id>-45</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>ED2BABEAAFC5425B304B6A58A6986D38DC1F249A2B29BA88C89475F517FDCE74</strong>
+												<weak>4116923183</weak>
+												<size>5011</size>
+												<position>321</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/info.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-63</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -15570,6 +15594,30 @@
 										<id>-21</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>58091DC5EBEE7F90249253E3177232040F23E5D75F6530A54041D93DBFE99291</strong>
+												<weak>2889971768</weak>
+												<size>11308</size>
+												<position>321</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-9</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -15699,167 +15747,115 @@
 										<stream_hook_path>
 											<container>
 												<size>2</size>
-												<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-												<weak>3664841048</weak>
-												<size>11133</size>
-												<position>927</position>
-												<strong>6B3B617AC518A2177BDB89656E726B4E4D79577E289130493A61BAE24FB64838</strong>
-												<weak>3173127726</weak>
-												<size>1101</size>
-												<position>1103</position>
+												<strong>99DDC29B8C4D366F7A5A5819117AF190E5255231DD9313E1CC0D56BCD9D89BAA</strong>
+												<weak>2051148095</weak>
+												<size>1039</size>
+												<position>548</position>
+												<strong>12EE98255E53951EE44D5D95A0506693E9F5F9D371505F490B8C0676EB383C7C</strong>
+												<weak>2825495330</weak>
+												<size>622</size>
+												<position>411</position>
 											</container>
 										</stream_hook_path>
 									</hook>
 									<file>
 										<path>
 											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
 											<type>0</type>
 											<base>0</base>
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-77</id>
+										<id>-58</id>
 									</shared_ptr>
 								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
 											<container>
-												<size>2</size>
-												<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-												<weak>3664841048</weak>
-												<size>11133</size>
-												<position>927</position>
-												<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
-												<weak>3624753243</weak>
-												<size>279</size>
-												<position>103</position>
+												<size>3</size>
+												<strong>99DDC29B8C4D366F7A5A5819117AF190E5255231DD9313E1CC0D56BCD9D89BAA</strong>
+												<weak>2051148095</weak>
+												<size>1039</size>
+												<position>548</position>
+												<strong>12EE98255E53951EE44D5D95A0506693E9F5F9D371505F490B8C0676EB383C7C</strong>
+												<weak>2825495330</weak>
+												<size>622</size>
+												<position>411</position>
+												<strong>38B566F2C6678B8724D18086A6F76E077DC2ADC1BB69A4B83BF0A2C3B7D31B50</strong>
+												<weak>2218658069</weak>
+												<size>31</size>
+												<position>143</position>
 											</container>
 										</stream_hook_path>
 									</hook>
 									<file>
 										<path>
 											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
 											<type>0</type>
 											<base>0</base>
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-25</id>
+										<id>-8</id>
 									</shared_ptr>
 								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
 											<container>
-												<size>2</size>
-												<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-												<weak>3664841048</weak>
-												<size>11133</size>
-												<position>927</position>
-												<strong>44A436E88E9302D907AF1F343063D988F0F87C863E372EA97378835C64480093</strong>
-												<weak>308353940</weak>
-												<size>75</size>
-												<position>26</position>
+												<size>3</size>
+												<strong>99DDC29B8C4D366F7A5A5819117AF190E5255231DD9313E1CC0D56BCD9D89BAA</strong>
+												<weak>2051148095</weak>
+												<size>1039</size>
+												<position>548</position>
+												<strong>12EE98255E53951EE44D5D95A0506693E9F5F9D371505F490B8C0676EB383C7C</strong>
+												<weak>2825495330</weak>
+												<size>622</size>
+												<position>411</position>
+												<strong>98B33BE76679E3A4831241335CD5DFF6F634429F36BABF96C1D4DC2296C5ECC5</strong>
+												<weak>1584672077</weak>
+												<size>208</size>
+												<position>259</position>
 											</container>
 										</stream_hook_path>
 									</hook>
 									<file>
 										<path>
 											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
 											<type>0</type>
 											<base>0</base>
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-10</id>
+										<id>-34</id>
 									</shared_ptr>
 								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
 											<container>
-												<size>2</size>
-												<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-												<weak>3664841048</weak>
-												<size>11133</size>
-												<position>927</position>
-												<strong>B86F5C0A69B3847A8FC514C61F1DF8EA5DAFFDEC2748F6FD3494198D3741ABC7</strong>
-												<weak>639423670</weak>
-												<size>901</size>
-												<position>8905</position>
+												<size>1</size>
+												<strong>5594B7B6271DE43F8A8783A856C365F0E2DDC193C9ED293DE67EC75F16C1ABAD</strong>
+												<weak>3976881657</weak>
+												<size>5132</size>
+												<position>321</position>
 											</container>
 										</stream_hook_path>
 									</hook>
 									<file>
 										<path>
 											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/diagnostic_information.hpp</string>
 											<type>0</type>
 											<base>0</base>
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-15</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-												<weak>3664841048</weak>
-												<size>11133</size>
-												<position>927</position>
-												<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
-												<weak>2078296250</weak>
-												<size>305</size>
-												<position>9808</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-55</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>653D3C91AD796FCE5C1616DDD06D72FBE40969C6111B92AC3AA425AB7D451FAB</strong>
-												<weak>3664841048</weak>
-												<size>11133</size>
-												<position>927</position>
-												<strong>F65C82C62C1EEA672C42FE46189491942DE15B2F8C998E7CAE49588C7D8CBFFA</strong>
-												<weak>1041900763</weak>
-												<size>143</size>
-												<position>10115</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-32</id>
+										<id>-40</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -15938,30 +15934,6 @@
 										<id>-52</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>1922E0A161BF6AA0886BC01B3BBBB31AB7C50C55F1274209985A1EFB086FD8C7</strong>
-												<weak>989285904</weak>
-												<size>5062</size>
-												<position>321</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/diagnostic_information.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-40</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -16042,24 +16014,168 @@
 									<hook>
 										<stream_hook_path>
 											<container>
-												<size>1</size>
-												<strong>64E81A46AD2B7E1AFE2718B02484CF9AFE7287CB1DF2CBFFE7B25B7D8D5FDBE3</strong>
-												<weak>3361882888</weak>
-												<size>5012</size>
-												<position>321</position>
+												<size>2</size>
+												<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+												<weak>2285342938</weak>
+												<size>10602</size>
+												<position>927</position>
+												<strong>1760DA943E0DCAE6DDB000F3C08D6E6F5F8AEDBBEAC7CAA84A2ED60BFA4B0E1A</strong>
+												<weak>702729709</weak>
+												<size>815</size>
+												<position>1307</position>
 											</container>
 										</stream_hook_path>
 									</hook>
 									<file>
 										<path>
 											<empty>0</empty>
-											<string>../../../../boost/exception/info.hpp</string>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
 											<type>0</type>
 											<base>0</base>
 										</path>
 									</file>
 									<shared_ptr>
-										<id>-63</id>
+										<id>-77</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+												<weak>2285342938</weak>
+												<size>10602</size>
+												<position>927</position>
+												<strong>796BD0D716259ADB3173AFA2A7989E3F52F5D007D67D132DE95A080801510B50</strong>
+												<weak>1299192030</weak>
+												<size>7151</size>
+												<position>2124</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-15</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+												<weak>2285342938</weak>
+												<size>10602</size>
+												<position>927</position>
+												<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
+												<weak>3624753243</weak>
+												<size>279</size>
+												<position>177</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-25</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+												<weak>2285342938</weak>
+												<size>10602</size>
+												<position>927</position>
+												<strong>44A436E88E9302D907AF1F343063D988F0F87C863E372EA97378835C64480093</strong>
+												<weak>308353940</weak>
+												<size>75</size>
+												<position>26</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-10</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+												<weak>2285342938</weak>
+												<size>10602</size>
+												<position>927</position>
+												<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
+												<weak>2078296250</weak>
+												<size>305</size>
+												<position>9277</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-55</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>E283724582D1A1C7FADAEF8260CF64EA42A359DD1DE0109AB380B839DD00C5E1</strong>
+												<weak>2285342938</weak>
+												<size>10602</size>
+												<position>927</position>
+												<strong>F65C82C62C1EEA672C42FE46189491942DE15B2F8C998E7CAE49588C7D8CBFFA</strong>
+												<weak>1041900763</weak>
+												<size>143</size>
+												<position>9584</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-32</id>
 									</shared_ptr>
 								</pair>
 								<pair>
@@ -16150,7 +16266,7 @@
 												<strong>964F6A1CDF157430B6F65ABDD6A590CFA6AE83EAED66B5B59BA829DB07DF97F2</strong>
 												<weak>3653363251</weak>
 												<size>731</size>
-												<position>735</position>
+												<position>780</position>
 												<strong>36688510914673386A7870D1D4970B7D74CF9A4B7226F9E225A5607DCBFB12C4</strong>
 												<weak>2314308857</weak>
 												<size>446</size>
@@ -16170,122 +16286,6 @@
 										<id>-19</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>073C70F0D1C27474AB493044E52FFE0D1C3295AE64271A3810FE4EAADF180FF8</strong>
-												<weak>4147382513</weak>
-												<size>1041</size>
-												<position>548</position>
-												<strong>5D5B59DE2E0728CF19BDD22BF7DE3FADAD08B422B577E0705508F6D9FB6707C7</strong>
-												<weak>387228411</weak>
-												<size>623</size>
-												<position>412</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-58</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>3</size>
-												<strong>073C70F0D1C27474AB493044E52FFE0D1C3295AE64271A3810FE4EAADF180FF8</strong>
-												<weak>4147382513</weak>
-												<size>1041</size>
-												<position>548</position>
-												<strong>5D5B59DE2E0728CF19BDD22BF7DE3FADAD08B422B577E0705508F6D9FB6707C7</strong>
-												<weak>387228411</weak>
-												<size>623</size>
-												<position>412</position>
-												<strong>38B566F2C6678B8724D18086A6F76E077DC2ADC1BB69A4B83BF0A2C3B7D31B50</strong>
-												<weak>2218658069</weak>
-												<size>31</size>
-												<position>143</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-8</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>3</size>
-												<strong>073C70F0D1C27474AB493044E52FFE0D1C3295AE64271A3810FE4EAADF180FF8</strong>
-												<weak>4147382513</weak>
-												<size>1041</size>
-												<position>548</position>
-												<strong>5D5B59DE2E0728CF19BDD22BF7DE3FADAD08B422B577E0705508F6D9FB6707C7</strong>
-												<weak>387228411</weak>
-												<size>623</size>
-												<position>412</position>
-												<strong>5EB718F617CB65548DFF259216ED67278E1B4EA43BF5605D242448780D8C477E</strong>
-												<weak>68818004</weak>
-												<size>97</size>
-												<position>370</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-34</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>68C66297C6264EA69A6D19027C04B5113B3061648DA859BD91CB456B0A0526F8</strong>
-												<weak>905703606</weak>
-												<size>11839</size>
-												<position>321</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-9</id>
-									</shared_ptr>
-								</pair>
 							</sorted>
 						</index>
 					</object>
diff --git a/include/boost/exception/detail/exception_ptr.hpp b/include/boost/exception/detail/exception_ptr.hpp
index 0179082..e98b98b 100644
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@@ -30,6 +30,9 @@ boost
     {
     typedef shared_ptr<exception_detail::clone_base const> exception_ptr;
 
+    template <class T>
+    exception_ptr copy_exception( T const & );
+
 #ifndef BOOST_NO_RTTI
     typedef error_info<struct tag_original_exception_type,std::type_info const *> original_exception_type;
 
@@ -44,37 +47,42 @@ boost
     namespace
     exception_detail
         {
-        inline
-        static
-        exception_ptr
-        exception_ptr_bad_alloc()
-            {
-            static
-            struct
-            bad_alloc_:
-                std::bad_alloc,
-                exception_detail::clone_base
+        struct
+        bad_alloc_:
+            boost::exception,
+            std::bad_alloc
                 {
-                clone_base const *
-                clone() const
-                    {
-                    return new bad_alloc_(*this);
-                    }
-                void
-                rethrow() const
-                    {
-                    throw*this;
-                    }
-                } e;
-            return exception_ptr(exception_ptr(),&e);
+                };
+
+        template <int Line>
+        exception_ptr
+        get_bad_alloc()
+            {
+            static exception_ptr e = copy_exception(
+                bad_alloc_() <<
+                throw_function("boost::current_exception()") <<
+                throw_file(__FILE__) <<
+                throw_line(Line) );
+            return e;
             }
+
+        template <int Line>
+        struct
+        exception_ptr_bad_alloc
+            {
+            static exception_ptr const e;
+            };
+
+        template <int Line>
+        exception_ptr const
+        exception_ptr_bad_alloc<Line>::
+        e = get_bad_alloc<Line>();
         }
 
     class
     unknown_exception:
-        public exception,
-        public std::exception,
-        public exception_detail::clone_base
+        public boost::exception,
+        public std::exception
         {
         public:
 
@@ -101,18 +109,6 @@ boost
 
         private:
 
-        exception_detail::clone_base const *
-        clone() const
-            {
-            return new unknown_exception(*this);
-            }
-
-        void
-        rethrow() const
-            {
-            throw*this;
-            }
-
         template <class E>
         void
         add_original_type( E const & e )
@@ -130,8 +126,7 @@ boost
         class
         current_exception_std_exception_wrapper:
             public T,
-            public boost::exception,
-            public clone_base
+            public boost::exception
             {
             public:
 
@@ -155,18 +150,6 @@ boost
 
             private:
 
-            clone_base const *
-            clone() const
-                {
-                return new current_exception_std_exception_wrapper(*this);
-                }
-
-            void
-            rethrow() const
-                {
-                throw *this;
-                }
-
             template <class E>
             void
             add_original_type( E const & e )
@@ -179,7 +162,7 @@ boost
 
 #ifdef BOOST_NO_RTTI
         template <class T>
-        exception const *
+        boost::exception const *
         get_boost_exception( T const * )
             {
             try
@@ -187,7 +170,7 @@ boost
                 throw;
                 }
             catch(
-            exception & x )
+            boost::exception & x )
                 {
                 return &x;
                 }
@@ -198,10 +181,10 @@ boost
             }
 #else
         template <class T>
-        exception const *
+        boost::exception const *
         get_boost_exception( T const * x )
             {
-            return dynamic_cast<exception const *>(x);
+            return dynamic_cast<boost::exception const *>(x);
             }
 #endif
 
@@ -211,23 +194,23 @@ boost
         current_exception_std_exception( T const & e1 )
             {
             if( boost::exception const * e2 = get_boost_exception(&e1) )
-                return shared_ptr<current_exception_std_exception_wrapper<T> const>(new current_exception_std_exception_wrapper<T>(e1,*e2));
+                return copy_exception(current_exception_std_exception_wrapper<T>(e1,*e2));
             else
-                return shared_ptr<current_exception_std_exception_wrapper<T> const>(new current_exception_std_exception_wrapper<T>(e1));
+                return copy_exception(current_exception_std_exception_wrapper<T>(e1));
             }
 
         inline
         exception_ptr
         current_exception_unknown_exception()
             {
-            return shared_ptr<unknown_exception const>(new unknown_exception());
+            return copy_exception(unknown_exception());
             }
 
         inline
         exception_ptr
         current_exception_unknown_boost_exception( boost::exception const & e )
             {
-            return shared_ptr<unknown_exception const>(new unknown_exception(e));
+            return copy_exception(unknown_exception(e));
             }
 
         inline
@@ -237,7 +220,7 @@ boost
             if( boost::exception const * be = get_boost_exception(&e) )
                 return current_exception_unknown_boost_exception(*be);
             else
-                return shared_ptr<unknown_exception const>(new unknown_exception(e));
+                return copy_exception(unknown_exception(e));
             }
 
         inline
@@ -356,7 +339,7 @@ boost
         catch(
         std::bad_alloc & )
             {
-            ret=exception_detail::exception_ptr_bad_alloc();
+            ret=exception_detail::exception_ptr_bad_alloc<__LINE__>::e;
             }
         catch(
         ... )
@@ -368,7 +351,7 @@ boost
             catch(
             std::bad_alloc & )
                 {
-                ret=exception_detail::exception_ptr_bad_alloc();
+                ret=exception_detail::exception_ptr_bad_alloc<__LINE__>::e;
                 }
             catch(
             ... )
diff --git a/include/boost/exception/info.hpp b/include/boost/exception/info.hpp
index 2d8b71f..8c393a6 100644
--- a/include/boost/exception/info.hpp
+++ b/include/boost/exception/info.hpp
@@ -47,7 +47,7 @@ boost
 
     template <class Tag,class T>
     inline
-	std::string
+    std::string
     error_info<Tag,T>::
     tag_typeid_name() const
         {