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/basic_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/basic_iterator.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/iterator/basic_iterator.hpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/iterator/basic_iterator.hpp b/3rdParty/Boost/src/boost/fusion/iterator/basic_iterator.hpp index 4327a8c..bab6a4a 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/basic_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/basic_iterator.hpp @@ -8,6 +8,7 @@ #ifndef BOOST_FUSION_ITERATOR_BASIC_ITERATOR_HPP #define BOOST_FUSION_ITERATOR_BASIC_ITERATOR_HPP +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/iterator_facade.hpp> #include <boost/mpl/and.hpp> @@ -39,7 +40,7 @@ namespace boost { namespace fusion template<typename Tag, typename Category, typename Seq, int Index> struct basic_iterator - : iterator_facade<basic_iterator<Tag,Category,Seq,Index>, Category> + : iterator_facade<basic_iterator<Tag, Category, Seq, Index>, Category> { typedef mpl::int_<Index> index; typedef Seq seq_type; @@ -76,6 +77,7 @@ namespace boost { namespace fusion basic_iterator<Tag, Category, Seq, Index + N::value> type; + BOOST_FUSION_GPU_ENABLED static type call(It const& it) { @@ -98,6 +100,7 @@ namespace boost { namespace fusion { typedef mpl::minus<typename It2::index, typename It1::index> type; + BOOST_FUSION_GPU_ENABLED static type call(It1 const&, It2 const&) @@ -118,15 +121,18 @@ namespace boost { namespace fusion {}; template<typename OtherSeq> + BOOST_FUSION_GPU_ENABLED basic_iterator(basic_iterator<Tag,Category,OtherSeq,Index> const& it) : seq(it.seq) {} + BOOST_FUSION_GPU_ENABLED basic_iterator(Seq& in_seq, int) : seq(&in_seq) {} template<typename OtherSeq> + BOOST_FUSION_GPU_ENABLED basic_iterator& operator=(basic_iterator<Tag,Category,OtherSeq,Index> const& it) { |