From 754fd941ee0c30c347eaaf77706c8a797b8fdf18 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Thu, 26 Nov 2009 21:58:16 +0000
Subject: [PATCH] Merge [57950], [57952] to release. Fixes #3404. Fixes #3456.

[SVN r57959]
---
 enable_shared_from_this.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/enable_shared_from_this.html b/enable_shared_from_this.html
index 3f35665..c4caa25 100644
--- a/enable_shared_from_this.html
+++ b/enable_shared_from_this.html
@@ -29,20 +29,24 @@
 			and <STRONG>shared_ptr&lt;T const&gt;</STRONG>, depending on constness, to <STRONG>this</STRONG>.</P>
 		<h3><a name="Example">Example</a></h3>
 		<pre>
-class Y: public enable_shared_from_this&lt;Y&gt;
+#include &lt;boost/enable_shared_from_this.hpp&gt;
+#include &lt;boost/shared_ptr.hpp&gt;
+#include &lt;cassert&gt;
+
+class Y: public boost::enable_shared_from_this&lt;Y&gt;
 {
 public:
 
-    shared_ptr&lt;Y&gt; f()
+    boost::shared_ptr&lt;Y&gt; f()
     {
         return shared_from_this();
     }
-}
+};
 
 int main()
 {
-    shared_ptr&lt;Y&gt; p(new Y);
-    shared_ptr&lt;Y&gt; q = p-&gt;f();
+    boost::shared_ptr&lt;Y&gt; p(new Y);
+    boost::shared_ptr&lt;Y&gt; q = p-&gt;f();
     assert(p == q);
     assert(!(p &lt; q || q &lt; p)); // p and q must share ownership
 }