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] 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