Subject: [Boost-commit] svn:boost r73518 - in branches/release: boost/multi_index libs/multi_index/doc
From: joaquin_at_[hidden]
Date: 2011-08-03 17:03:49
Author: joaquin
Date: 2011-08-03 17:03:48 EDT (Wed, 03 Aug 2011)
New Revision: 73518
URL: http://svn.boost.org/trac/boost/changeset/73518
Log:
merged [73498] from trunk
Text files modified:
branches/release/boost/multi_index/hashed_index.hpp | 16 ++++++++++++++++
branches/release/boost/multi_index/ordered_index.hpp | 18 +++++++++++++++++-
branches/release/boost/multi_index/random_access_index.hpp | 13 ++++++++++++-
branches/release/boost/multi_index/sequenced_index.hpp | 13 ++++++++++++-
branches/release/libs/multi_index/doc/release_notes.html | 14 +++++++++++++-
5 files changed, 70 insertions(+), 4 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 2011-08-03 17:03:48 EDT (Wed, 03 Aug 2011)
@@ -19,7 +19,9 @@
#include <boost/detail/allocator_utilities.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/foreach_fwd.hpp>
#include <boost/limits.hpp>
+#include <boost/mpl/bool.hpp>
#include <boost/mpl/push_front.hpp>
#include <boost/multi_index/detail/access_specifier.hpp>
#include <boost/multi_index/detail/auto_space.hpp>
@@ -1240,6 +1242,20 @@
} /* 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
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 2011-08-03 17:03:48 EDT (Wed, 03 Aug 2011)
@@ -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 <boost/call_traits.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/foreach_fwd.hpp>
#include <boost/iterator/reverse_iterator.hpp>
+#include <boost/mpl/bool.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/push_front.hpp>
#include <boost/multi_index/detail/access_specifier.hpp>
@@ -1385,6 +1387,20 @@
} /* 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
Modified: branches/release/boost/multi_index/random_access_index.hpp
==============================================================================
--- branches/release/boost/multi_index/random_access_index.hpp (original)
+++ branches/release/boost/multi_index/random_access_index.hpp 2011-08-03 17:03:48 EDT (Wed, 03 Aug 2011)
@@ -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 <boost/call_traits.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/foreach_fwd.hpp>
#include <boost/iterator/reverse_iterator.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/not.hpp>
@@ -1003,6 +1004,16 @@
} /* namespace boost */
+/* Boost.Foreach compatibility */
+
+template<typename SuperMeta,typename TagList>
+inline boost::mpl::true_* boost_foreach_is_noncopyable(
+ boost::multi_index::detail::random_access_index<SuperMeta,TagList>*&,
+ boost::foreach::tag)
+{
+ return 0;
+}
+
#undef BOOST_MULTI_INDEX_RND_INDEX_CHECK_INVARIANT
#endif
Modified: branches/release/boost/multi_index/sequenced_index.hpp
==============================================================================
--- branches/release/boost/multi_index/sequenced_index.hpp (original)
+++ branches/release/boost/multi_index/sequenced_index.hpp 2011-08-03 17:03:48 EDT (Wed, 03 Aug 2011)
@@ -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 <boost/detail/allocator_utilities.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/foreach_fwd.hpp>
#include <boost/iterator/reverse_iterator.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/not.hpp>
@@ -917,6 +918,16 @@
} /* namespace boost */
+/* Boost.Foreach compatibility */
+
+template<typename SuperMeta,typename TagList>
+inline boost::mpl::true_* boost_foreach_is_noncopyable(
+ boost::multi_index::detail::sequenced_index<SuperMeta,TagList>*&,
+ boost::foreach::tag)
+{
+ return 0;
+}
+
#undef BOOST_MULTI_INDEX_SEQ_INDEX_CHECK_INVARIANT
#endif
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-08-03 17:03:48 EDT (Wed, 03 Aug 2011)
@@ -31,6 +31,7 @@
<h2>Contents</h2>
<ul>
+ <li>Boost 1.48 release</li>
<li>Boost 1.47 release</li>
<li>Boost 1.44 release</li>
<li>Boost 1.43 release</li>
@@ -45,6 +46,17 @@
<li>Boost 1.33 release</li>
</ul>
+<h2><a name="boost_1_48">Boost 1.48 release</a></h2>
+
+<p>
+<ul>
+ <li>Fixed a compatibility problem with
+ Boost.Foreach
+ (ticket #5741).
+ </li>
+</ul>
+</p>
+
<h2><a name="boost_1_47">Boost 1.47 release</a></h2>
<p>
@@ -336,7 +348,7 @@
<br>
-<p>Revised May 6th 2011</p>
+<p>Revised August 3rd 2011</p>
<p>© Copyright 2003-2011 Joaquín M López Muñoz.
Distributed under the Boost Software