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/sequence/intrinsic/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/sequence/intrinsic/detail')
5 files changed, 18 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp index 968718e..81d0966 100644 --- a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp +++ b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp> #include <boost/fusion/iterator/segmented_iterator.hpp> #include <boost/fusion/view/iterator_range.hpp> @@ -19,22 +20,23 @@ namespace boost { namespace fusion { namespace detail { //auto segmented_begin( seq ) //{ - // return make_segmented_iterator( segmented_begin_impl( seq, nil ) ); + // return make_segmented_iterator( segmented_begin_impl( seq, nil_ ) ); //} - template <typename Sequence, typename Nil = fusion::nil> + template <typename Sequence, typename Nil_ = fusion::nil_> struct segmented_begin { typedef segmented_iterator< - typename segmented_begin_impl<Sequence, Nil>::type + typename segmented_begin_impl<Sequence, Nil_>::type > type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq) { return type( - segmented_begin_impl<Sequence, Nil>::call(seq, Nil())); + segmented_begin_impl<Sequence, Nil_>::call(seq, Nil_())); } }; diff --git a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp index 5069432..2ab4627 100644 --- a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_BEGIN_IMPL_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_BEGIN_IMPL_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/type_traits/remove_const.hpp> #include <boost/fusion/container/list/cons_fwd.hpp> #include <boost/fusion/sequence/intrinsic_fwd.hpp> @@ -37,6 +38,7 @@ namespace boost { namespace fusion { namespace detail typedef cons<range_type, Context> type; typedef mpl::false_ continue_type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq, State const&, Context const& context, segmented_begin_fun) { return type(range_type(fusion::begin(seq), fusion::end(seq)), context); @@ -62,6 +64,7 @@ namespace boost { namespace fusion { namespace detail typedef typename fold_impl::type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq, Stack const& stack) { return fold_impl::call(seq, end_impl::call(seq, stack), stack, segmented_begin_fun()); @@ -76,6 +79,7 @@ namespace boost { namespace fusion { namespace detail typedef iterator_range<begin_type, end_type> pair_type; typedef cons<pair_type, Stack> type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq, Stack stack) { return type(pair_type(fusion::begin(seq), fusion::end(seq)), stack); diff --git a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp index 469862a..c26865a 100644 --- a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp +++ b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp> #include <boost/fusion/iterator/segmented_iterator.hpp> #include <boost/fusion/container/list/cons.hpp> @@ -18,19 +19,20 @@ namespace boost { namespace fusion { namespace detail // return make_segmented_iterator( segmented_end_impl( seq ) ); //} - template <typename Sequence, typename Nil = fusion::nil> + template <typename Sequence, typename Nil_ = fusion::nil_> struct segmented_end { typedef segmented_iterator< - typename segmented_end_impl<Sequence, Nil>::type + typename segmented_end_impl<Sequence, Nil_>::type > type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence & seq) { return type( - segmented_end_impl<Sequence, Nil>::call(seq, Nil())); + segmented_end_impl<Sequence, Nil_>::call(seq, Nil_())); } }; diff --git a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp index 149027b..9be1504 100644 --- a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_END_IMPL_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_END_IMPL_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 { namespace detail typedef iterator_range<end_type, end_type> pair_type; typedef cons<pair_type, Stack> type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence & seq, Stack stack) { end_type end = fusion::end(fusion::segments(seq)); diff --git a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp index 03cef28..4defced 100644 --- a/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp +++ b/3rdParty/Boost/src/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_SIZE_08112006_1141) #define BOOST_FUSION_SEGMENTED_SIZE_08112006_1141 +#include <boost/fusion/support/config.hpp> #include <boost/type_traits/add_const.hpp> #include <boost/type_traits/remove_reference.hpp> #include <boost/mpl/fold.hpp> |