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/algorithm/query | |
| 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/algorithm/query')
7 files changed, 34 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/any.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/any.hpp index 8b1fca0..4ab9714 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/any.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/any.hpp @@ -9,6 +9,7 @@ #if !defined(FUSION_ANY_05052005_1230) #define FUSION_ANY_05052005_1230 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/support/category_of.hpp> #include <boost/fusion/algorithm/query/detail/any.hpp> @@ -24,6 +25,7 @@ namespace boost { namespace fusion } template <typename Sequence, typename F> + BOOST_FUSION_GPU_ENABLED inline bool any(Sequence const& seq, F f) { diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/any.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/any.hpp index 5f6b857..4e05368 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/any.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/any.hpp @@ -9,6 +9,7 @@ #if !defined(FUSION_ANY_05052005_1229) #define FUSION_ANY_05052005_1229 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/bool.hpp> #include <boost/fusion/sequence/intrinsic/begin.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp> @@ -23,6 +24,7 @@ namespace boost { namespace fusion { namespace detail { template <typename First, typename Last, typename F> + BOOST_FUSION_GPU_ENABLED inline bool linear_any(First const&, Last const&, F const&, mpl::true_) { @@ -30,6 +32,7 @@ namespace detail } template <typename First, typename Last, typename F> + BOOST_FUSION_GPU_ENABLED inline bool linear_any(First const& first, Last const& last, F& f, mpl::false_) { @@ -43,6 +46,7 @@ namespace detail } template <typename Sequence, typename F, typename Tag> + BOOST_FUSION_GPU_ENABLED inline bool any(Sequence const& seq, F f, Tag) { @@ -59,6 +63,7 @@ namespace detail struct unrolled_any { template <typename It, typename F> + BOOST_FUSION_GPU_ENABLED static bool call(It const& it, F f) { return @@ -74,6 +79,7 @@ namespace detail struct unrolled_any<3> { template <typename It, typename F> + BOOST_FUSION_GPU_ENABLED static bool call(It const& it, F f) { return @@ -87,6 +93,7 @@ namespace detail struct unrolled_any<2> { template <typename It, typename F> + BOOST_FUSION_GPU_ENABLED static bool call(It const& it, F f) { return @@ -99,6 +106,7 @@ namespace detail struct unrolled_any<1> { template <typename It, typename F> + BOOST_FUSION_GPU_ENABLED static bool call(It const& it, F f) { return f(*it); @@ -109,6 +117,7 @@ namespace detail struct unrolled_any<0> { template <typename It, typename F> + BOOST_FUSION_GPU_ENABLED static bool call(It const&, F) { return false; @@ -116,6 +125,7 @@ namespace detail }; template <typename Sequence, typename F> + BOOST_FUSION_GPU_ENABLED inline bool any(Sequence const& seq, F f, random_access_traversal_tag) { diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/find_if.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/find_if.hpp index f7bae45..41baab4 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/find_if.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/find_if.hpp @@ -9,6 +9,7 @@ #if !defined(FUSION_FIND_IF_05052005_1107) #define FUSION_FIND_IF_05052005_1107 +#include <boost/fusion/support/config.hpp> #include <boost/mpl/apply.hpp> #include <boost/mpl/eval_if.hpp> #include <boost/mpl/identity.hpp> @@ -183,6 +184,7 @@ namespace detail type; template <typename Iterator> + BOOST_FUSION_GPU_ENABLED static type recursive_call(Iterator const& iter, mpl::true_) { @@ -190,6 +192,7 @@ namespace detail } template <typename Iterator> + BOOST_FUSION_GPU_ENABLED static type recursive_call(Iterator const& iter, mpl::false_) { @@ -197,6 +200,7 @@ namespace detail } template <typename Iterator> + BOOST_FUSION_GPU_ENABLED static type recursive_call(Iterator const& iter) { @@ -205,6 +209,7 @@ namespace detail } template <typename Iterator, typename Tag> + BOOST_FUSION_GPU_ENABLED static type choose_call(Iterator const& iter, Tag) { @@ -212,6 +217,7 @@ namespace detail } template <typename Iterator> + BOOST_FUSION_GPU_ENABLED static type choose_call(Iterator const& iter, random_access_traversal_tag) { @@ -220,6 +226,7 @@ namespace detail } template <typename Iterator> + BOOST_FUSION_GPU_ENABLED static type iter_call(Iterator const& iter) { @@ -227,6 +234,7 @@ namespace detail } template <typename Sequence> + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq) { diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/segmented_find.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/segmented_find.hpp index ead5783..21c13a4 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/segmented_find.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/detail/segmented_find.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/eval_if.hpp> #include <boost/mpl/identity.hpp> #include <boost/fusion/algorithm/query/find_fwd.hpp> @@ -44,16 +45,19 @@ namespace boost { namespace fusion { namespace detail >::type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq, State const&state, Context const& context, segmented_find_fun) { return call_impl(seq, state, context, continue_type()); } + BOOST_FUSION_GPU_ENABLED static type call_impl(Sequence&, State const&state, Context const&, mpl::true_) { return state; } + BOOST_FUSION_GPU_ENABLED static type call_impl(Sequence& seq, State const&, Context const& context, mpl::false_) { return fusion::make_segmented_iterator(fusion::find<T>(seq), context); @@ -74,6 +78,7 @@ namespace boost { namespace fusion { namespace detail >::type type; + BOOST_FUSION_GPU_ENABLED static type call(Sequence& seq) { return fusion::segmented_fold_until( diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/find.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/find.hpp index 16def08..56e53c3 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/find.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/find.hpp @@ -8,6 +8,7 @@ #if !defined(FUSION_FIND_05052005_1107) #define FUSION_FIND_05052005_1107 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/algorithm/query/find_if_fwd.hpp> #include <boost/fusion/algorithm/query/detail/find_if.hpp> #include <boost/fusion/algorithm/query/detail/segmented_find.hpp> @@ -46,6 +47,7 @@ namespace boost { namespace fusion } template <typename T, typename Sequence> + BOOST_FUSION_GPU_ENABLED inline typename lazy_disable_if< is_const<Sequence> @@ -58,6 +60,7 @@ namespace boost { namespace fusion } template <typename T, typename Sequence> + BOOST_FUSION_GPU_ENABLED inline typename result_of::find<Sequence const, T>::type const find(Sequence const& seq) { diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/find_fwd.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/find_fwd.hpp index 96d989a..a43b5ea 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/find_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/find_fwd.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_FIND_FWD_HPP_INCLUDED) #define BOOST_FUSION_FIND_FWD_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_const.hpp> @@ -19,6 +20,7 @@ namespace boost { namespace fusion } template <typename T, typename Sequence> + BOOST_FUSION_GPU_ENABLED inline typename lazy_disable_if< is_const<Sequence> @@ -27,6 +29,7 @@ namespace boost { namespace fusion find(Sequence& seq); template <typename T, typename Sequence> + BOOST_FUSION_GPU_ENABLED inline typename result_of::find<Sequence const, T>::type const find(Sequence const& seq); }} diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/query/find_if_fwd.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/query/find_if_fwd.hpp index adb8f2d..419a68c 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/query/find_if_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/query/find_if_fwd.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_FIND_IF_FWD_HPP_INCLUDED) #define BOOST_FUSION_FIND_IF_FWD_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_const.hpp> @@ -20,6 +21,7 @@ namespace boost { namespace fusion } template <typename Pred, typename Sequence> + BOOST_FUSION_GPU_ENABLED typename lazy_disable_if< is_const<Sequence> @@ -28,6 +30,7 @@ namespace boost { namespace fusion find_if(Sequence& seq); template <typename Pred, typename Sequence> + BOOST_FUSION_GPU_ENABLED typename result_of::find_if<Sequence const, Pred>::type const find_if(Sequence const& seq); }} |