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/view/iterator_range | |
| 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/view/iterator_range')
9 files changed, 28 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/at_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/at_impl.hpp index 1b42523..0626ae2 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/at_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/at_impl.hpp @@ -8,6 +8,7 @@ #if !defined(BOOST_FUSION_ITERATOR_RANGE_AT_IMPL_HPP_INCLUDED) #define BOOST_FUSION_ITERATOR_RANGE_AT_IMPL_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/advance.hpp> #include <boost/fusion/iterator/deref.hpp> @@ -30,6 +31,7 @@ namespace boost { namespace fusion typedef typename result_of::advance<begin_type,N>::type pos; typedef typename result_of::deref<pos>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Seq& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/begin_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/begin_impl.hpp index 2902e73..e34b6ed 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/begin_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/begin_impl.hpp @@ -24,6 +24,7 @@ namespace boost { namespace fusion { typedef typename Sequence::begin_type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/end_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/end_impl.hpp index 3147afe..2428198 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/end_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/end_impl.hpp @@ -24,6 +24,7 @@ namespace boost { namespace fusion { typedef typename Sequence::end_type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp index 032225d..88f4358 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_ITERATOR_RANGE_IS_SEGMENTED_HPP_INCLUDED) #define BOOST_FUSION_ITERATOR_RANGE_IS_SEGMENTED_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/assert.hpp> #include <boost/mpl/bool.hpp> diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp index 9bf459c..7dc4506 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_RANGE_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_ITERATOR_RANGE_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/assert.hpp> #include <boost/type_traits/add_const.hpp> #include <boost/type_traits/remove_reference.hpp> @@ -47,6 +48,7 @@ namespace boost { namespace fusion } template <typename Sequence, typename T> + BOOST_FUSION_GPU_ENABLED typename lazy_enable_if< traits::is_sequence<Sequence> @@ -55,6 +57,7 @@ namespace boost { namespace fusion push_back(Sequence const& seq, T const& x); template <typename Sequence, typename T> + BOOST_FUSION_GPU_ENABLED typename lazy_enable_if< traits::is_sequence<Sequence> @@ -70,7 +73,7 @@ namespace boost { namespace fusion { namespace detail // switch (size(stack_begin)) // { // case 1: - // return nil; + // return nil_; // case 2: // // car(cdr(stack_begin)) is a range over values. // assert(end(front(car(stack_begin))) == end(car(cdr(stack_begin)))); @@ -149,6 +152,7 @@ namespace boost { namespace fusion { namespace detail > type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const& stack) { //return segment_sequence( @@ -195,6 +199,7 @@ namespace boost { namespace fusion { namespace detail > type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const& stack) { // return iterator_range(begin(car(cdr(stack_begin))), end(front(car(stack_begin)))); @@ -205,8 +210,9 @@ namespace boost { namespace fusion { namespace detail template <typename Stack> struct make_segment_sequence_front<Stack, 1> { - typedef typename Stack::cdr_type type; // nil + typedef typename Stack::cdr_type type; // nil_ + BOOST_FUSION_GPU_ENABLED static type call(Stack const &stack) { return stack.cdr; @@ -218,7 +224,7 @@ namespace boost { namespace fusion { namespace detail // switch (size(stack_end)) // { // case 1: - // return nil; + // return nil_; // case 2: // // car(cdr(stack_back)) is a range over values. // assert(end(front(car(stack_end))) == end(car(cdr(stack_end)))); @@ -292,6 +298,7 @@ namespace boost { namespace fusion { namespace detail > type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const& stack) { // return segment_sequence( @@ -338,6 +345,7 @@ namespace boost { namespace fusion { namespace detail > type; + BOOST_FUSION_GPU_ENABLED static type call(Stack const& stack) { // return iterator_range(begin(front(car(stack_end))), begin(car(cdr(stack_end)))); @@ -348,8 +356,9 @@ namespace boost { namespace fusion { namespace detail template <typename Stack> struct make_segment_sequence_back<Stack, 1> { - typedef typename Stack::cdr_type type; // nil + typedef typename Stack::cdr_type type; // nil_ + BOOST_FUSION_GPU_ENABLED static type call(Stack const& stack) { return stack.cdr; @@ -428,6 +437,7 @@ namespace boost { namespace fusion { namespace detail > type; + BOOST_FUSION_GPU_ENABLED static type call(StackBegin stack_begin, StackEnd stack_end) { //return segment_sequence( @@ -461,6 +471,7 @@ namespace boost { namespace fusion { namespace detail typename impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(StackBegin stack_begin, StackEnd stack_end) { return impl::call(stack_begin.cdr, stack_end.cdr); @@ -490,6 +501,7 @@ namespace boost { namespace fusion { namespace detail segment_sequence<segment_type> type; + BOOST_FUSION_GPU_ENABLED static type call(StackBegin stack_begin, StackEnd stack_end) { //return segment_sequence( @@ -519,6 +531,7 @@ namespace boost { namespace fusion { namespace detail typedef typename impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(Begin const& begin, End const& end) { return impl::call( diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segments_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segments_impl.hpp index ede4968..9d570cf 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segments_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/segments_impl.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_ITERATOR_RANGE_SEGMENTS_HPP_INCLUDED) #define BOOST_FUSION_ITERATOR_RANGE_SEGMENTS_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/assert.hpp> #include <boost/fusion/sequence/intrinsic/segments.hpp> #include <boost/fusion/support/is_segmented.hpp> @@ -40,6 +41,7 @@ namespace boost { namespace fusion typename result_of::segments<typename impl::type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence & seq) { return fusion::segments(impl::call(seq.first, seq.last)); diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/size_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/size_impl.hpp index 90951b2..0678e5d 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/size_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/size_impl.hpp @@ -8,6 +8,7 @@ #if !defined(BOOST_FUSION_ITERATOR_RANGE_SIZE_IMPL_HPP_INCLUDED) #define BOOST_FUSION_ITERATOR_RANGE_SIZE_IMPL_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/distance.hpp> namespace boost { namespace fusion diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/value_at_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/value_at_impl.hpp index b6fe888..652b8da 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/value_at_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/detail/value_at_impl.hpp @@ -8,6 +8,7 @@ #if !defined(BOOST_FUSION_ITERATOR_RANGE_VALUE_AT_IMPL_HPP_INCLUDED) #define BOOST_FUSION_ITERATOR_RANGE_VALUE_AT_IMPL_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/advance.hpp> #include <boost/fusion/iterator/value_of.hpp> diff --git a/3rdParty/Boost/src/boost/fusion/view/iterator_range/iterator_range.hpp b/3rdParty/Boost/src/boost/fusion/view/iterator_range/iterator_range.hpp index 4f517c8..f5aafd4 100644 --- a/3rdParty/Boost/src/boost/fusion/view/iterator_range/iterator_range.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/iterator_range/iterator_range.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_ITERATOR_RANGE_05062005_1224) #define FUSION_ITERATOR_RANGE_05062005_1224 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/sequence_base.hpp> #include <boost/fusion/support/category_of.hpp> @@ -43,6 +44,7 @@ namespace boost { namespace fusion typedef typename traits::category_of<begin_type>::type category; + BOOST_FUSION_GPU_ENABLED iterator_range(First const& in_first, Last const& in_last) : first(convert_iterator<First>::call(in_first)) , last(convert_iterator<Last>::call(in_last)) {} |