[Boost-commit] svn:boost r75691 - in branches/release: boost libs/multi_index/doc

Subject: [Boost-commit] svn:boost r75691 - in branches/release: boost libs/multi_index/doc
From: joaquin_at_[hidden]
Date: 2011-11-27 08:52:16

Author: joaquin
Date: 2011-11-27 08:52:14 EST (Sun, 27 Nov 2011)
New Revision: 75691
URL: http://svn.boost.org/trac/boost/changeset/75691

Log:
merged [75643] from trunk
Text files modified: 
   branches/release/boost/multi_index_container.hpp         |     4 ++--                                    
   branches/release/libs/multi_index/doc/release_notes.html |    13 ++++++++++++-                           
   2 files changed, 14 insertions(+), 3 deletions(-)

Modified: branches/release/boost/multi_index_container.hpp
==============================================================================
--- branches/release/boost/multi_index_container.hpp	(original)
+++ branches/release/boost/multi_index_container.hpp	2011-11-27 08:52:14 EST (Sun, 27 Nov 2011)
@@ -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 @@
     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);

Modified: branches/release/libs/multi_index/doc/release_notes.html
==============================================================================
--- branches/release/libs/multi_index/doc/release_notes.html	(original)
+++ branches/release/libs/multi_index/doc/release_notes.html	2011-11-27 08:52:14 EST (Sun, 27 Nov 2011)
@@ -31,6 +31,7 @@
 <h2>Contents</h2>
 
 <ul>
+  <li>Boost 1.49 release</li>
   <li>Boost 1.48 release</li>
   <li>Boost 1.47 release</li>
   <li>Boost 1.44 release</li>
@@ -46,6 +47,16 @@
   <li>Boost 1.33 release</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 #3365.
+  </li>
+</ul>
+</p>
+
 <h2><a name="boost_1_48">Boost 1.48 release</a></h2>
 
 <p>
@@ -348,7 +359,7 @@
 
 <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