diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-22 21:56:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:47 +0300 |
| commit | e9f0133f9071d410e1a8f4721f0a2ca1aca4a1a8 (patch) | |
| tree | 8e0bb938410211bb8371fac496295ca221683a00 /boost | |
| parent | c2d2b521e83db2c83c64e5dcfb9ea65af9d5732a (diff) | |
This is already in bost 1.53
Change-Id: Ibde92f39ac53ee897ee90953b7f60129ba49bd97
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 3 | ||||
| -rw-r--r-- | boost/boost.4874.patch | 49 |
2 files changed, 0 insertions, 52 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 28ee031cadbe..28791eb503d2 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -36,9 +36,6 @@ boost_patches += boost_1_44_0-clang-warnings.patch boost_patches += boost_1_44_0-gcc4.8.patch -# https://svn.boost.org/trac/boost/changeset/78496 -boost_patches += boost.4874.patch - boost_patches += boost.loplugin.patch boost_patches += boost.std.move.patch boost_patches += boost.wundef.patch diff --git a/boost/boost.4874.patch b/boost/boost.4874.patch deleted file mode 100644 index c401cf77c116..000000000000 --- a/boost/boost.4874.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: branches/release/boost/multi_array/base.hpp -=================================================================== ---- a/branches/release/boost/multi_array/base.hpp -+++ b/branches/release/boost/multi_array/base.hpp -@@ -18,6 +18,7 @@ - // functionality is acquired - // - -+#include "boost/multi_array/collection_concept.hpp" - #include "boost/multi_array/extent_range.hpp" - #include "boost/multi_array/extent_gen.hpp" - #include "boost/multi_array/index_range.hpp" -@@ -252,5 +253,17 @@ - ///////////////////////////////////////////////////////////////////////// - -- -+// Due to some imprecision in the C++ Standard, -+// MSVC 2010 is broken in debug mode: it requires -+// that an Output Iterator have output_iterator_tag in its iterator_category if -+// that iterator is not bidirectional_iterator or random_access_iterator. -+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) -+struct mutable_iterator_tag -+ : boost::random_access_traversal_tag, std::input_iterator_tag -+{ -+ operator std::output_iterator_tag() const { -+ return std::output_iterator_tag(); -+ } -+}; -+#endif - - //////////////////////////////////////////////////////////////////////// -@@ -322,5 +343,6 @@ - const index* strides, - const index* index_bases) const { -- -+ boost::function_requires< -+ detail::multi_array::CollectionConcept<IndexList> >(); - ignore_unused_variable_warning(index_bases); - ignore_unused_variable_warning(extents); -Index: branches/release/boost/multi_array/concept_checks.hpp -=================================================================== ---- a/branches/release/boost/multi_array/concept_checks.hpp -+++ b/branches/release/boost/multi_array/concept_checks.hpp -@@ -132,4 +132,5 @@ - function_requires< boost_concepts::ForwardTraversalConcept<const_iterator> >(); - function_requires< boost_concepts::ReadableIteratorConcept<const_iterator> >(); -+ function_requires< boost::OutputIterator<iterator,value_type> >(); - - // RG - a( CollectionArchetype) when available... |