merged [61775] from trunk

git-svn-id: http://svn.boost.org/svn/boost/branches/release@61776 b8fc166d-592f-0410-95f2-cb63ce0dd405
pocb · May 4, 2010 · d09dc71 · d09dc71
1 parent fd79ad3
commit d09dc71
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/libs/flyweight/doc/release_notes.html b/libs/flyweight/doc/release_notes.html
@@ -31,11 +31,22 @@ <h1><img src="../../../boost.png" alt="Boost logo" align=
 <h2>Contents</h2>
 
 <ul>
+  <li><a href="#boost_1_44">Boost 1.44 release</a></li>
   <li><a href="#boost_1_40">Boost 1.40 release</a></li>
   <li><a href="#boost_1_39">Boost 1.39 release</a></li>
   <li><a href="#boost_1_38">Boost 1.38 release</a></li>
 </ul>
 
+<h2><a name="boost_1_44">Boost 1.44 release</a></h2>
+
+<p>
+<ul>
+  <li>Fixed an incorrect mode of usage of Boost.Variant in
+    <a href="examples.html#example3">one of the examples</a>.
+  </li>
+</ul>
+</p>
+
 <h2><a name="boost_1_40">Boost 1.40 release</a></h2>
 
 <p>
@@ -78,9 +89,9 @@ <h2><a name="boost_1_38">Boost 1.38 release</a></h2>
 
 <br>
 
-<p>Revised April 25th 2009</p>
+<p>Revised May 4th 2010</p>
 
-<p>&copy; Copyright 2006-2009 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.
+<p>&copy; Copyright 2006-2010 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.
 Distributed under the Boost Software 
 License, Version 1.0. (See accompanying file <a href="../../../LICENSE_1_0.txt">
 LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">

diff --git a/libs/flyweight/example/composite.cpp b/libs/flyweight/example/composite.cpp
@@ -1,6 +1,6 @@
 /* Boost.Flyweight example of a composite design.
  *
- * Copyright 2006-2008 Joaquin M Lopez Munoz.
+ * Copyright 2006-2010 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -63,10 +63,8 @@ struct list_hasher:boost::static_visitor<std::size_t>
     return h(str);
   }
 
-  std::size_t operator()(
-    const boost::recursive_wrapper<list_elems>& elmsw)const
+  std::size_t operator()(const list_elems& elms)const
   {
-    const list_elems& elms=elmsw.get();
     std::size_t res=0;
     for(list_elems::const_iterator it=elms.begin(),it_end=elms.end();
         it!=it_end;++it){