Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/fusion/iterator/detail | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/fusion/iterator/detail')
8 files changed, 34 insertions, 6 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_deref_traits.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_deref_traits.hpp index 197dfc1..ef60055 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_deref_traits.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_deref_traits.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_ADAPT_DEREF_TRAITS_05062005_0900) #define FUSION_ADAPT_DEREF_TRAITS_05062005_0900 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/deref.hpp> namespace boost { namespace fusion { namespace detail @@ -20,6 +21,7 @@ namespace boost { namespace fusion { namespace detail result_of::deref<typename Iterator::first_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_value_traits.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_value_traits.hpp index 6649ade..e27a2f9 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_value_traits.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/adapt_value_traits.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_ADAPT_VALUE_TRAITS_05062005_0859) #define FUSION_ADAPT_VALUE_TRAITS_05062005_0859 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/value_of.hpp> namespace boost { namespace fusion { namespace detail diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/advance.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/advance.hpp index 56dfab9..ace4ed4 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/advance.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/advance.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_ADVANCE_09172005_1149) #define FUSION_ADVANCE_09172005_1149 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/int.hpp> #include <boost/mpl/if.hpp> #include <boost/mpl/eval_if.hpp> @@ -44,6 +45,7 @@ namespace boost { namespace fusion { namespace advance_detail >::type type; + BOOST_FUSION_GPU_ENABLED static type const& call(type const& i) { @@ -51,6 +53,7 @@ namespace boost { namespace fusion { namespace advance_detail } template <typename I> + BOOST_FUSION_GPU_ENABLED static type call(I const& i) { @@ -83,6 +86,7 @@ namespace boost { namespace fusion { namespace advance_detail >::type type; + BOOST_FUSION_GPU_ENABLED static type const& call(type const& i) { @@ -90,6 +94,7 @@ namespace boost { namespace fusion { namespace advance_detail } template <typename I> + BOOST_FUSION_GPU_ENABLED static type call(I const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/distance.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/distance.hpp index 3994cb3..c037995 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/distance.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/distance.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_DISTANCE_09172005_0730) #define FUSION_DISTANCE_09172005_0730 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/int.hpp> #include <boost/mpl/if.hpp> #include <boost/mpl/eval_if.hpp> @@ -52,6 +53,7 @@ namespace boost { namespace fusion { namespace distance_detail >::type type; + BOOST_FUSION_GPU_ENABLED static type call(First const&, Last const&) { diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/segment_sequence.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/segment_sequence.hpp index c372a83..90db25e 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/segment_sequence.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/segment_sequence.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_SEQUENCE_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_SEQUENCE_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/bool.hpp> #include <boost/type_traits/remove_reference.hpp> #include <boost/fusion/support/tag_of.hpp> @@ -29,7 +30,7 @@ namespace boost { namespace fusion { namespace detail typedef Sequence sequence_type; sequence_type sequence; - explicit segment_sequence(Sequence const & seq) + BOOST_FUSION_GPU_ENABLED explicit segment_sequence(Sequence const & seq) : sequence(seq) {} }; @@ -60,6 +61,7 @@ namespace extension { typedef typename Sequence::sequence_type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence & seq) { return seq.sequence; diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_equal_to.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_equal_to.hpp index 1e4ad26..77a080f 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_equal_to.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_equal_to.hpp @@ -7,13 +7,14 @@ #if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_EQUAL_TO_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_ITERATOR_EQUAL_TO_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/and.hpp> #include <boost/mpl/bool.hpp> #include <boost/fusion/iterator/equal_to.hpp> namespace boost { namespace fusion { - struct nil; + struct nil_; namespace detail { @@ -32,7 +33,7 @@ namespace boost { namespace fusion {}; template <> - struct segmented_equal_to<fusion::nil, fusion::nil> + struct segmented_equal_to<fusion::nil_, fusion::nil_> : mpl::true_ {}; } diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp index ccd45fb..1d4f62d 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/bool.hpp> #include <boost/fusion/sequence/intrinsic_fwd.hpp> #include <boost/fusion/iterator/iterator_facade.hpp> @@ -19,7 +20,7 @@ namespace boost { namespace fusion { - struct nil; + struct nil_; namespace detail { @@ -34,7 +35,7 @@ namespace boost { namespace fusion struct segmented_iterator : iterator_facade<segmented_iterator<Context>, forward_traversal_tag> { - explicit segmented_iterator(Context const& ctx) + BOOST_FUSION_GPU_ENABLED explicit segmented_iterator(Context const& ctx) : context(ctx) {} @@ -51,6 +52,7 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { return *it.context.car.first; @@ -70,6 +72,7 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { return fusion::deref_data(it.context.car.first); @@ -129,6 +132,7 @@ namespace boost { namespace fusion typedef detail::segmented_next_impl<typename It::context_type> impl; typedef segmented_iterator<typename impl::type> type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { return type(impl::call(it.context)); diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_next_impl.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_next_impl.hpp index 2a7f6f6..a2b75d7 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_next_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_next_impl.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_NEXT_IMPL_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_ITERATOR_NEXT_IMPL_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/type_traits/add_const.hpp> #include <boost/type_traits/remove_reference.hpp> #include <boost/fusion/iterator/equal_to.hpp> @@ -64,6 +65,7 @@ namespace boost { namespace fusion cons<car_type, typename Stack::cdr_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return type( @@ -83,7 +85,7 @@ namespace boost { namespace fusion //auto segmented_next_impl_recurse3(stack) //{ // if (size(stack) == 1) - // return cons(iterator_range(end(car(stack)), end(car(stack))), nil); + // return cons(iterator_range(end(car(stack)), end(car(stack))), nil_); // else // return segmented_next_impl_recurse(stack.cdr); //} @@ -96,6 +98,7 @@ namespace boost { namespace fusion typedef segmented_next_impl_recurse<typename Stack::cdr_type> impl; typedef typename impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return impl::call(stack.cdr); @@ -109,6 +112,7 @@ namespace boost { namespace fusion typedef iterator_range<end_type, end_type> range_type; typedef cons<range_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return type(range_type(stack.car.last, stack.car.last)); @@ -143,6 +147,7 @@ namespace boost { namespace fusion typedef segmented_next_impl_recurse3<Stack> impl; typedef typename impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return impl::call(stack); @@ -154,6 +159,7 @@ namespace boost { namespace fusion { typedef Result type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return segmented_begin_impl<Sequence, Stack>::call(*stack.car.first, stack); @@ -179,6 +185,7 @@ namespace boost { namespace fusion typename segmented_next_impl_recurse<typename Stack::cdr_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const& stack) { return segmented_next_impl_recurse<typename Stack::cdr_type>::call(stack.cdr); @@ -190,6 +197,7 @@ namespace boost { namespace fusion { typedef Next type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return pop_front_car<Stack>::call(stack); @@ -202,6 +210,7 @@ namespace boost { namespace fusion typedef segmented_next_impl_recurse2<Next> impl; typedef typename impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return impl::call(pop_front_car<Stack>::call(stack)); @@ -227,6 +236,7 @@ namespace boost { namespace fusion typedef segmented_next_impl_recurse<typename Stack::cdr_type> impl; typedef typename impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return impl::call(stack.cdr); @@ -238,6 +248,7 @@ namespace boost { namespace fusion { typedef Next type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const & stack) { return pop_front_car<Stack>::call(stack); |