Quickbook: Merge from trunk to quickbook-dev

[SVN r75739]

doc/release_notes.html

@@ -31,6 +31,7 @@ Acknowledgements
 <h2>Contents</h2>
 
 <ul>
+  <li><a href="#boost_1_49">Boost 1.49 release</a></li>
   <li><a href="#boost_1_48">Boost 1.48 release</a></li>
   <li><a href="#boost_1_47">Boost 1.47 release</a></li>
   <li><a href="#boost_1_44">Boost 1.44 release</a></li>
@@ -46,6 +47,16 @@ Acknowledgements
   <li><a href="#boost_1_33">Boost 1.33 release</a></li>
 </ul>
 
+<h2><a name="boost_1_49">Boost 1.49 release</a></h2>
+
+<p>
+<ul>
+  <li>Suppressed a potential narrow conversion warning described in
+    ticket <a href="https://svn.boost.org/trac/boost/ticket/3365">#3365</a>.
+  </li>
+</ul>
+</p>
+
 <h2><a name="boost_1_48">Boost 1.48 release</a></h2>
 
 <p>
@@ -348,7 +359,7 @@ Acknowledgements
 
 <br>
 
-<p>Revised August 3rd 2011</p>
+<p>Revised November 24th 2011</p>
 
 <p>&copy; Copyright 2003-2011 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.
 Distributed under the Boost Software 

include/boost/multi_index_container.hpp

@@ -1,6 +1,6 @@
 /* Multiply indexed container.
  *
- * Copyright 2003-2010 Joaquin M Lopez Munoz.
+ * Copyright 2003-2011 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)
@@ -670,7 +670,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
     if(version<1){
       std::size_t sz;
       ar>>serialization::make_nvp("count",sz);
-      s=sz;
+      s=static_cast<serialization::collection_size_type>(sz);
     }
     else{
       ar>>serialization::make_nvp("count",s);