From 1186efb3f0b92c1faca6100992dd9ecc6c0b4865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20M=20L=C3=B3pez=20Mu=C3=B1oz?= Date: Mon, 2 May 2011 15:06:01 +0000 Subject: [PATCH 1/3] fixed problem reported at http://lists.boost.org/boost-users/2011/05/68022.php [SVN r71671] --- doc/release_notes.html | 16 ++++++++++++++-- include/boost/multi_index/composite_key.hpp | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/doc/release_notes.html b/doc/release_notes.html index d5d7f81..8a0d55a 100644 --- a/doc/release_notes.html +++ b/doc/release_notes.html @@ -31,6 +31,7 @@ Acknowledgements

Contents

+

Boost 1.47 release

+ +

+

+

+

Boost 1.44 release

@@ -323,9 +335,9 @@ Acknowledgements
-

Revised April 22nd 2010

+

Revised May 2nd 2011

-

© Copyright 2003-2010 Joaquín M López Muñoz. +

© Copyright 2003-2011 Joaquín M López Muñoz. Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/multi_index/composite_key.hpp b/include/boost/multi_index/composite_key.hpp index cedc75e..2c21a6a 100644 --- a/include/boost/multi_index/composite_key.hpp +++ b/include/boost/multi_index/composite_key.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 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) @@ -998,7 +998,7 @@ public: const composite_key_result& x, const Value& y)const { - return operator()(x,make_tuple(cref(y))); + return operator()(x,boost::make_tuple(boost::cref(y))); } #endif @@ -1033,7 +1033,7 @@ public: const Value& x, const composite_key_result& y)const { - return operator()(make_tuple(cref(x)),y); + return operator()(boost::make_tuple(boost::cref(x)),y); } #endif From bac508586ef57eea1014dceec4ab71b6858304f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20M=20L=C3=B3pez=20Mu=C3=B1oz?= Date: Fri, 6 May 2011 19:56:06 +0000 Subject: [PATCH 2/3] fixed #5488 [SVN r71770] --- doc/release_notes.html | 3 ++- include/boost/multi_index/hashed_index.hpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/release_notes.html b/doc/release_notes.html index 8a0d55a..2be8fd0 100644 --- a/doc/release_notes.html +++ b/doc/release_notes.html @@ -53,6 +53,7 @@ Acknowledgements composite_key_compare related with Boost.Ref. +

  • Maintenance fixes.

    • @@ -335,7 +336,7 @@ Acknowledgements
    -

    Revised May 2nd 2011

    +

    Revised May 6th 2011

    © Copyright 2003-2011 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 393a585..1220e44 100644 --- a/include/boost/multi_index/hashed_index.hpp +++ b/include/boost/multi_index/hashed_index.hpp @@ -1,4 +1,4 @@ -/* 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) @@ -605,7 +605,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: hash(tuples::get<2>(args_list.get_head())), eq(tuples::get<3>(args_list.get_head())), buckets(al,header()->impl(),tuples::get<0>(args_list.get_head())), - mlf(1.0), + mlf(1.0f), first_bucket(buckets.size()) { calculate_max_load(); From 867a0fb9c95cd84d97d669f18d0f49ee157e0637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20M=20L=C3=B3pez=20Mu=C3=B1oz?= Date: Wed, 3 Aug 2011 06:31:26 +0000 Subject: [PATCH 3/3] fixed #5741 [SVN r73498] --- doc/release_notes.html | 14 +++++++++++++- include/boost/multi_index/hashed_index.hpp | 16 ++++++++++++++++ include/boost/multi_index/ordered_index.hpp | 18 +++++++++++++++++- .../boost/multi_index/random_access_index.hpp | 13 ++++++++++++- include/boost/multi_index/sequenced_index.hpp | 13 ++++++++++++- 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/doc/release_notes.html b/doc/release_notes.html index 2be8fd0..a71d4d3 100644 --- a/doc/release_notes.html +++ b/doc/release_notes.html @@ -31,6 +31,7 @@ Acknowledgements

    Contents

    +

    Boost 1.48 release

    + +

    +

    +

    +

    Boost 1.47 release

    @@ -336,7 +348,7 @@ Acknowledgements
    -

    Revised May 6th 2011

    +

    Revised August 3rd 2011

    © Copyright 2003-2011 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 1220e44..0ee4aeb 100644 --- a/include/boost/multi_index/hashed_index.hpp +++ b/include/boost/multi_index/hashed_index.hpp @@ -19,7 +19,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -1240,6 +1242,20 @@ struct hashed_non_unique } /* namespace boost */ +/* Boost.Foreach compatibility */ + +template< + typename KeyFromValue,typename Hash,typename Pred, + typename SuperMeta,typename TagList,typename Category +> +inline boost::mpl::true_* boost_foreach_is_noncopyable( + boost::multi_index::detail::hashed_index< + KeyFromValue,Hash,Pred,SuperMeta,TagList,Category>*&, + boost::foreach::tag) +{ + return 0; +} + #undef BOOST_MULTI_INDEX_HASHED_INDEX_CHECK_INVARIANT #endif diff --git a/include/boost/multi_index/ordered_index.hpp b/include/boost/multi_index/ordered_index.hpp index a49e4cf..20475e0 100644 --- a/include/boost/multi_index/ordered_index.hpp +++ b/include/boost/multi_index/ordered_index.hpp @@ -1,4 +1,4 @@ -/* 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) @@ -45,7 +45,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -1385,6 +1387,20 @@ struct ordered_non_unique } /* namespace boost */ +/* Boost.Foreach compatibility */ + +template< + typename KeyFromValue,typename Compare, + typename SuperMeta,typename TagList,typename Category +> +inline boost::mpl::true_* boost_foreach_is_noncopyable( + boost::multi_index::detail::ordered_index< + KeyFromValue,Compare,SuperMeta,TagList,Category>*&, + boost::foreach::tag) +{ + return 0; +} + #undef BOOST_MULTI_INDEX_ORD_INDEX_CHECK_INVARIANT #endif diff --git a/include/boost/multi_index/random_access_index.hpp b/include/boost/multi_index/random_access_index.hpp index b779549..c45913a 100644 --- a/include/boost/multi_index/random_access_index.hpp +++ b/include/boost/multi_index/random_access_index.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 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) @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -1003,6 +1004,16 @@ struct random_access } /* namespace boost */ +/* Boost.Foreach compatibility */ + +template +inline boost::mpl::true_* boost_foreach_is_noncopyable( + boost::multi_index::detail::random_access_index*&, + boost::foreach::tag) +{ + return 0; +} + #undef BOOST_MULTI_INDEX_RND_INDEX_CHECK_INVARIANT #endif diff --git a/include/boost/multi_index/sequenced_index.hpp b/include/boost/multi_index/sequenced_index.hpp index 8e09115..e8832ee 100644 --- a/include/boost/multi_index/sequenced_index.hpp +++ b/include/boost/multi_index/sequenced_index.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 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) @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -917,6 +918,16 @@ struct sequenced } /* namespace boost */ +/* Boost.Foreach compatibility */ + +template +inline boost::mpl::true_* boost_foreach_is_noncopyable( + boost::multi_index::detail::sequenced_index*&, + boost::foreach::tag) +{ + return 0; +} + #undef BOOST_MULTI_INDEX_SEQ_INDEX_CHECK_INVARIANT #endif