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

Subject: [Boost-commit] svn:boost r64324 - in branches/release: boost/multi_index libs/multi_index/doc libs/multi_index/test
From: joaquin_at_[hidden]
Date: 2010-07-25 06:44:56

Author: joaquin
Date: 2010-07-25 06:44:55 EDT (Sun, 25 Jul 2010)
New Revision: 64324
URL: http://svn.boost.org/trac/boost/changeset/64324

Log:
merged [61482] from trunk
Text files modified: 
   branches/release/boost/multi_index/hashed_index.hpp      |     4 ++--                                    
   branches/release/boost/multi_index/ordered_index.hpp     |     4 ++--                                    
   branches/release/libs/multi_index/doc/release_notes.html |    17 ++++++++++++++++-                       
   branches/release/libs/multi_index/test/pair_of_ints.hpp  |    14 +++++++-------                          
   4 files changed, 27 insertions(+), 12 deletions(-)

Modified: branches/release/boost/multi_index/hashed_index.hpp
==============================================================================
--- branches/release/boost/multi_index/hashed_index.hpp	(original)
+++ branches/release/boost/multi_index/hashed_index.hpp	2010-07-25 06:44:55 EDT (Sun, 25 Jul 2010)
@@ -1,4 +1,4 @@
-/* Copyright 2003-2008 Joaquin M Lopez Munoz.
+/* Copyright 2003-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)
@@ -396,7 +396,7 @@
     return modify(
       position,
       modify_key_adaptor<Modifier,value_type,KeyFromValue>(mod,key),
-      modify_key_adaptor<Modifier,value_type,KeyFromValue>(back,key));
+      modify_key_adaptor<Rollback,value_type,KeyFromValue>(back,key));
   }
 
   void clear()

Modified: branches/release/boost/multi_index/ordered_index.hpp
==============================================================================
--- branches/release/boost/multi_index/ordered_index.hpp	(original)
+++ branches/release/boost/multi_index/ordered_index.hpp	2010-07-25 06:44:55 EDT (Sun, 25 Jul 2010)
@@ -1,4 +1,4 @@
-/* Copyright 2003-2008 Joaquin M Lopez Munoz.
+/* Copyright 2003-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)
@@ -401,7 +401,7 @@
     return modify(
       position,
       modify_key_adaptor<Modifier,value_type,KeyFromValue>(mod,key),
-      modify_key_adaptor<Modifier,value_type,KeyFromValue>(back,key));
+      modify_key_adaptor<Rollback,value_type,KeyFromValue>(back,key));
   }
 
   void swap(ordered_index<KeyFromValue,Compare,SuperMeta,TagList,Category>& x)

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	2010-07-25 06:44:55 EDT (Sun, 25 Jul 2010)
@@ -31,6 +31,7 @@
 <h2>Contents</h2>
 
 <ul>
+  <li>Boost 1.44 release</li>
   <li>Boost 1.43 release</li>
   <li>Boost 1.42 release</li>
   <li>Boost 1.41 release</li>
@@ -43,6 +44,20 @@
   <li>Boost 1.33 release</li>
 </ul>
 
+<h2><a name="boost_1_44">Boost 1.44 release</a></h2>
+
+<p>
+<ul>
+  <li>
+    Fixed a bug preventing the use of <code>modify_key</code> with
+    rollback in ordered and
+    hashed indices when
+    <code>Modifier</code> and <code>Rollback</code> are different types
+    (ticket #4130).
+  </li>
+</ul>
+</p>
+
 <h2><a name="boost_1_43">Boost 1.43 release</a></h2>
 
 <p>
@@ -308,7 +323,7 @@
 
 <br>
 
-<p>Revised February 3rd 2010</p>
+<p>Revised April 22nd 2010</p>
 
 <p>&copy; Copyright 2003-2010 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.
 Distributed under the Boost Software 

Modified: branches/release/libs/multi_index/test/pair_of_ints.hpp
==============================================================================
--- branches/release/libs/multi_index/test/pair_of_ints.hpp	(original)
+++ branches/release/libs/multi_index/test/pair_of_ints.hpp	2010-07-25 06:44:55 EDT (Sun, 25 Jul 2010)
@@ -1,6 +1,6 @@
 /* Used in Boost.MultiIndex tests.
  *
- * Copyright 2003-2009 Joaquin M Lopez Munoz.
+ * Copyright 2003-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)
@@ -43,19 +43,19 @@
   ++x;
 }
 
-inline void decrement_first(pair_of_ints& p)
+inline int decrement_first(pair_of_ints& p)
 {
-  --p.first;
+  return --p.first;
 }
 
-inline void decrement_second(pair_of_ints& p)
+inline int decrement_second(pair_of_ints& p)
 {
-  --p.second;
+  return --p.second;
 }
 
-inline void decrement_int(int& x)
+inline int decrement_int(int& x)
 {
-  --x;
+  return --x;
 }
 
 #if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)