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/transform_view | |
| 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/transform_view')
14 files changed, 40 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/advance_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/advance_impl.hpp index 9027226..ae8a84c 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/advance_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/advance_impl.hpp @@ -8,6 +8,7 @@ #if !defined(FUSION_ADVANCE_IMPL_13122005_1906) #define FUSION_ADVANCE_IMPL_13122005_1906 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/advance.hpp> namespace boost { namespace fusion @@ -38,6 +39,7 @@ namespace boost { namespace fusion typedef typename Iterator::transform_type transform_type; typedef transform_view_iterator<advanced_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { @@ -60,6 +62,7 @@ namespace boost { namespace fusion typedef typename Iterator::transform_type transform_type; typedef transform_view_iterator2<advanced1_type, advanced2_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/apply_transform_result.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/apply_transform_result.hpp index 100055c..87c057f 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/apply_transform_result.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/apply_transform_result.hpp @@ -8,6 +8,7 @@ #if !defined(BOOST_FUSION_APPLY_TRANSFORM_RESULT_02092006_1936) #define BOOST_FUSION_APPLY_TRANSFORM_RESULT_02092006_1936 +#include <boost/fusion/support/config.hpp> #include <boost/utility/result_of.hpp> namespace boost { namespace fusion diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/at_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/at_impl.hpp index 5133de8..5c6dd8f 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/at_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/at_impl.hpp @@ -8,6 +8,7 @@ #if !defined(BOOST_FUSION_AT_IMPL_20061029_1946) #define BOOST_FUSION_AT_IMPL_20061029_1946 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/apply.hpp> #include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp> #include <boost/fusion/sequence/intrinsic/at.hpp> @@ -32,6 +33,7 @@ namespace boost { namespace fusion { typedef typename boost::fusion::result_of::at<typename Seq::sequence_type, N>::type value_type; typedef typename mpl::apply<transform_type, value_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Seq& seq) { return seq.f(boost::fusion::at<N>(seq.seq)); @@ -51,6 +53,7 @@ namespace boost { namespace fusion { typedef typename boost::fusion::result_of::at<typename Seq::sequence2_type, N>::type value2_type; typedef typename mpl::apply<transform_type, value1_type, value2_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Seq& seq) { return seq.f(boost::fusion::at<N>(seq.seq1), boost::fusion::at<N>(seq.seq2)); diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/begin_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/begin_impl.hpp index 09fe889..7c40505 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/begin_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/begin_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_BEGIN_IMPL_07162005_1031) #define FUSION_BEGIN_IMPL_07162005_1031 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/view/transform_view/transform_view_fwd.hpp> namespace boost { namespace fusion @@ -33,6 +34,7 @@ namespace boost { namespace fusion typedef typename Sequence::transform_type transform_type; typedef transform_view_iterator<first_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { @@ -53,6 +55,7 @@ namespace boost { namespace fusion typedef typename Sequence::transform_type transform_type; typedef transform_view_iterator2<first1_type, first2_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/deref_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/deref_impl.hpp index dcdf04e..35dacbd 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/deref_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/deref_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_DEREF_IMPL_07162005_1026) #define FUSION_DEREF_IMPL_07162005_1026 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/apply.hpp> #include <boost/fusion/iterator/deref.hpp> #include <boost/fusion/iterator/value_of.hpp> @@ -36,6 +37,7 @@ namespace boost { namespace fusion typedef detail::apply_transform_result<typename Iterator::transform_type> transform_type; typedef typename mpl::apply<transform_type, value_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { @@ -61,6 +63,7 @@ namespace boost { namespace fusion typedef detail::apply_transform_result<typename Iterator::transform_type> transform_type; typedef typename mpl::apply<transform_type, value1_type, value2_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/distance_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/distance_impl.hpp index 12a2d79..ecbc8c5 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/distance_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/distance_impl.hpp @@ -8,6 +8,7 @@ #if !defined(FUSION_DISTANCE_IMPL_13122005_2139) #define FUSION_DISTANCE_IMPL_13122005_2139 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/distance.hpp> namespace boost { namespace fusion { @@ -28,6 +29,7 @@ namespace boost { namespace fusion { struct apply : result_of::distance<typename First::first_type, typename Last::first_type> { + BOOST_FUSION_GPU_ENABLED static typename result_of::distance<typename First::first_type, typename Last::first_type>::type call(First const& first, Last const& last) @@ -45,6 +47,7 @@ namespace boost { namespace fusion { struct apply : result_of::distance<typename First::first1_type, typename Last::first1_type> { + BOOST_FUSION_GPU_ENABLED static typename result_of::distance<typename First::first1_type, typename Last::first1_type>::type call(First const& first, Last const& last) diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/end_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/end_impl.hpp index 0c19403..58e161b 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/end_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/end_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_END_IMPL_07162005_1028) #define FUSION_END_IMPL_07162005_1028 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/view/transform_view/transform_view_fwd.hpp> namespace boost { namespace fusion @@ -33,6 +34,7 @@ namespace boost { namespace fusion typedef typename Sequence::transform_type transform_type; typedef transform_view_iterator<last_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { @@ -53,6 +55,7 @@ namespace boost { namespace fusion typedef typename Sequence::transform_type transform_type; typedef transform_view_iterator2<last1_type, last2_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/equal_to_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/equal_to_impl.hpp index b1f0ae2..c4c6815 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/equal_to_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/equal_to_impl.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_TRANSFORM_VIEW_ITERATOR_20070127_0957) #define BOOST_FUSION_TRANSFORM_VIEW_ITERATOR_20070127_0957 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/equal_to.hpp> namespace boost { namespace fusion { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/next_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/next_impl.hpp index 5c61a60..cebba59 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/next_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/next_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_NEXT_IMPL_07162005_1029) #define FUSION_NEXT_IMPL_07162005_1029 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/next.hpp> namespace boost { namespace fusion @@ -37,6 +38,7 @@ namespace boost { namespace fusion typedef typename Iterator::transform_type transform_type; typedef transform_view_iterator<next_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { @@ -59,6 +61,7 @@ namespace boost { namespace fusion typedef typename Iterator::transform_type transform_type; typedef transform_view_iterator2<next1_type, next2_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/prior_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/prior_impl.hpp index 772b3e5..19c802c 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/prior_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/prior_impl.hpp @@ -8,6 +8,7 @@ #if !defined(FUSION_PREV_IMPL_13122005_2110) #define FUSION_PREV_IMPL_13122005_2110 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/prior.hpp> namespace boost { namespace fusion @@ -38,6 +39,7 @@ namespace boost { namespace fusion typedef typename Iterator::transform_type transform_type; typedef transform_view_iterator<prior_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { @@ -60,6 +62,7 @@ namespace boost { namespace fusion typedef typename Iterator::transform_type transform_type; typedef transform_view_iterator2<prior1_type, prior2_type, transform_type> type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_at_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_at_impl.hpp index 445bbd0..6875cbe 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_at_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_at_impl.hpp @@ -8,6 +8,7 @@ #if !defined(BOOST_FUSION_VALUE_AT_IMPL_20061101_0745) #define BOOST_FUSION_VALUE_AT_IMPL_20061101_0745 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/apply.hpp> #include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp> #include <boost/fusion/sequence/intrinsic/value_at.hpp> diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_of_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_of_impl.hpp index 1085862..ae20cd4 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_of_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/detail/value_of_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_VALUE_OF_IMPL_07162005_1030) #define FUSION_VALUE_OF_IMPL_07162005_1030 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/apply.hpp> #include <boost/fusion/iterator/value_of.hpp> #include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp> diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view.hpp index 1049f11..d18f49c 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_TRANSFORM_VIEW_07162005_1037) #define FUSION_TRANSFORM_VIEW_07162005_1037 +#include <boost/fusion/support/config.hpp> #include <boost/static_assert.hpp> #include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/is_view.hpp> @@ -55,15 +56,20 @@ namespace boost { namespace fusion typedef Sequence2 sequence2_type; typedef F transform_type; + BOOST_FUSION_GPU_ENABLED transform_view(Sequence1& in_seq1, Sequence2& in_seq2, F const& binop) : f(binop) , seq1(in_seq1) , seq2(in_seq2) {} + BOOST_FUSION_GPU_ENABLED first1_type first1() const { return fusion::begin(seq1); } + BOOST_FUSION_GPU_ENABLED first2_type first2() const { return fusion::begin(seq2); } + BOOST_FUSION_GPU_ENABLED last1_type last1() const { return fusion::end(seq1); } + BOOST_FUSION_GPU_ENABLED last2_type last2() const { return fusion::end(seq2); } transform_type f; @@ -94,12 +100,15 @@ namespace boost { namespace fusion typedef Sequence sequence_type; typedef F transform_type; + BOOST_FUSION_GPU_ENABLED transform_view(Sequence& in_seq, F const& in_f) : seq(in_seq) , f(in_f) {} + BOOST_FUSION_GPU_ENABLED first_type first() const { return fusion::begin(seq); } + BOOST_FUSION_GPU_ENABLED last_type last() const { return fusion::end(seq); } typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq; transform_type f; diff --git a/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view_iterator.hpp b/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view_iterator.hpp index af9d52b..0762228 100644 --- a/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/transform_view/transform_view_iterator.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_TRANSFORM_VIEW_ITERATOR_07162005_1033) #define FUSION_TRANSFORM_VIEW_ITERATOR_07162005_1033 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/support/iterator_base.hpp> #include <boost/fusion/support/category_of.hpp> #include <boost/fusion/iterator/mpl/convert_iterator.hpp> @@ -34,6 +35,7 @@ namespace boost { namespace fusion typedef typename traits::category_of<first_type>::type category; typedef F transform_type; + BOOST_FUSION_GPU_ENABLED transform_view_iterator(First const& in_first, F const& in_f) : first(converter::call(in_first)), f(in_f) {} @@ -60,6 +62,7 @@ namespace boost { namespace fusion typedef typename traits::category_of<first1_type>::type category; typedef F transform_type; + BOOST_FUSION_GPU_ENABLED transform_view_iterator2(First1 const& in_first1, First2 const& in_first2, F const& in_f) : first1(converter1::call(in_first1)), first2(converter2::call(in_first2)), f(in_f) {} |