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/iterator/detail/segmented_iterator.hpp | |
| 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/iterator/detail/segmented_iterator.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp index ccd45fb..1d4f62d 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/detail/segmented_iterator.hpp @@ -7,6 +7,7 @@ #if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED) #define BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED +#include <boost/fusion/support/config.hpp> #include <boost/mpl/bool.hpp> #include <boost/fusion/sequence/intrinsic_fwd.hpp> #include <boost/fusion/iterator/iterator_facade.hpp> @@ -19,7 +20,7 @@ namespace boost { namespace fusion { - struct nil; + struct nil_; namespace detail { @@ -34,7 +35,7 @@ namespace boost { namespace fusion struct segmented_iterator : iterator_facade<segmented_iterator<Context>, forward_traversal_tag> { - explicit segmented_iterator(Context const& ctx) + BOOST_FUSION_GPU_ENABLED explicit segmented_iterator(Context const& ctx) : context(ctx) {} @@ -51,6 +52,7 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { return *it.context.car.first; @@ -70,6 +72,7 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { return fusion::deref_data(it.context.car.first); @@ -129,6 +132,7 @@ namespace boost { namespace fusion typedef detail::segmented_next_impl<typename It::context_type> impl; typedef segmented_iterator<typename impl::type> type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { return type(impl::call(it.context)); |