diff --git a/doc/release_notes.html b/doc/release_notes.html
index c2b32a8..d5d7f81 100644
--- a/doc/release_notes.html
+++ b/doc/release_notes.html
@@ -31,6 +31,7 @@ Acknowledgements
Contents
+
+
+
+
+ -
+ Fixed a bug preventing the use of
modify_key
with
+ rollback in ordered and
+ hashed indices when
+ Modifier
and Rollback
are different types
+ (ticket #4130).
+
+
+
+
@@ -308,7 +323,7 @@ Acknowledgements
-
Revised February 3rd 2010
+Revised April 22nd 2010
© Copyright 2003-2010 Joaquín M López Muñoz.
Distributed under the Boost Software
diff --git a/include/boost/multi_index/hashed_index.hpp b/include/boost/multi_index/hashed_index.hpp
index 103eb67..393a585 100644
--- a/include/boost/multi_index/hashed_index.hpp
+++ b/include/boost/multi_index/hashed_index.hpp
@@ -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 @@ public:
return modify(
position,
modify_key_adaptor(mod,key),
- modify_key_adaptor(back,key));
+ modify_key_adaptor(back,key));
}
void clear()
diff --git a/include/boost/multi_index/ordered_index.hpp b/include/boost/multi_index/ordered_index.hpp
index f4b2519..a49e4cf 100644
--- a/include/boost/multi_index/ordered_index.hpp
+++ b/include/boost/multi_index/ordered_index.hpp
@@ -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 @@ public:
return modify(
position,
modify_key_adaptor(mod,key),
- modify_key_adaptor(back,key));
+ modify_key_adaptor(back,key));
}
void swap(ordered_index& x)
diff --git a/test/pair_of_ints.hpp b/test/pair_of_ints.hpp
index 29b7902..6089ffc 100644
--- a/test/pair_of_ints.hpp
+++ b/test/pair_of_ints.hpp
@@ -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 @@ inline void increment_int(int& x)
++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)