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/joint_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/joint_view')
10 files changed, 23 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/begin_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/begin_impl.hpp index a85a7e1..f58d129 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/begin_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/begin_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_BEGIN_IMPL_07162005_0115) #define FUSION_BEGIN_IMPL_07162005_0115 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/equal_to.hpp> #include <boost/mpl/if.hpp> @@ -42,18 +43,21 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s, mpl::true_) { return s.concat(); } + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s, mpl::false_) { return type(s.first(), s.concat()); } + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_data_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_data_impl.hpp index a60a125..02780d9 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_data_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_data_impl.hpp @@ -8,6 +8,7 @@ #ifndef BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_DEREF_DATA_IMPL_HPP #define BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_DEREF_DATA_IMPL_HPP +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/deref_data.hpp> namespace boost { namespace fusion { namespace extension @@ -25,6 +26,7 @@ namespace boost { namespace fusion { namespace extension result_of::deref_data<typename It::first_type>::type type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_impl.hpp index ea4055d..0e1e39f 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/deref_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_DEREF_IMPL_07162005_0137) #define FUSION_DEREF_IMPL_07162005_0137 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/detail/adapt_deref_traits.hpp> namespace boost { namespace fusion diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/end_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/end_impl.hpp index 7b88e56..b9e0113 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/end_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/end_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_END_IMPL_07162005_0128) #define FUSION_END_IMPL_07162005_0128 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/equal_to.hpp> #include <boost/mpl/if.hpp> @@ -27,6 +28,7 @@ namespace boost { namespace fusion { typedef typename Sequence::concat_last_type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& s) { diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/key_of_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/key_of_impl.hpp index e413c3d..ec682f6 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/key_of_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/key_of_impl.hpp @@ -8,6 +8,7 @@ #ifndef BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_KEY_OF_IMPL_HPP #define BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_KEY_OF_IMPL_HPP +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/key_of.hpp> namespace boost { namespace fusion { namespace extension diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/next_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/next_impl.hpp index 47b4d48..a3c066d 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/next_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/next_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_NEXT_IMPL_07162005_0136) #define FUSION_NEXT_IMPL_07162005_0136 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/next.hpp> #include <boost/fusion/iterator/equal_to.hpp> #include <boost/mpl/if.hpp> @@ -44,18 +45,21 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i, mpl::true_) { return i.concat; } + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i, mpl::false_) { return type(fusion::next(i.first), i.concat); } + BOOST_FUSION_GPU_ENABLED static type call(Iterator const& i) { diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp index cc883d7..f797135 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp @@ -8,6 +8,7 @@ #ifndef BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP #define BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/value_of_data.hpp> namespace boost { namespace fusion { namespace extension diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_impl.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_impl.hpp index 98637e4..f058a60 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_impl.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/detail/value_of_impl.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_VALUE_IMPL_07162005_0132) #define FUSION_VALUE_IMPL_07162005_0132 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/detail/adapt_value_traits.hpp> namespace boost { namespace fusion diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view.hpp index 11b74f9..3ad3191 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_JOINT_VIEW_07162005_0140) #define FUSION_JOINT_VIEW_07162005_0140 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/view/joint_view/joint_view_fwd.hpp> #include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/is_view.hpp> @@ -55,13 +56,17 @@ namespace boost { namespace fusion result_of::size<Sequence1>::value + result_of::size<Sequence2>::value> size; + BOOST_FUSION_GPU_ENABLED joint_view(Sequence1& in_seq1, Sequence2& in_seq2) : seq1(in_seq1) , seq2(in_seq2) {} + BOOST_FUSION_GPU_ENABLED first_type first() const { return fusion::begin(seq1); } + BOOST_FUSION_GPU_ENABLED concat_type concat() const { return fusion::begin(seq2); } + BOOST_FUSION_GPU_ENABLED concat_last_type concat_last() const { return fusion::end(seq2); } private: diff --git a/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view_iterator.hpp b/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view_iterator.hpp index 6f58248..9858474 100644 --- a/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/view/joint_view/joint_view_iterator.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_JOINT_VIEW_ITERATOR_07162005_0140) #define FUSION_JOINT_VIEW_ITERATOR_07162005_0140 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/support/iterator_base.hpp> #include <boost/fusion/iterator/equal_to.hpp> #include <boost/fusion/iterator/mpl/convert_iterator.hpp> @@ -40,6 +41,7 @@ namespace boost { namespace fusion typedef Category category; BOOST_STATIC_ASSERT((!result_of::equal_to<first_type, last_type>::value)); + BOOST_FUSION_GPU_ENABLED joint_view_iterator(First const& in_first, Concat const& in_concat) : first(first_converter::call(in_first)) , concat(concat_converter::call(in_concat)) |