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/container/list/cons_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/container/list/cons_iterator.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/list/cons_iterator.hpp | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/container/list/cons_iterator.hpp b/3rdParty/Boost/src/boost/fusion/container/list/cons_iterator.hpp index bc4fa09..42c023c 100644 --- a/3rdParty/Boost/src/boost/fusion/container/list/cons_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/list/cons_iterator.hpp @@ -8,6 +8,7 @@ #if !defined(FUSION_CONS_ITERATOR_07172005_0849) #define FUSION_CONS_ITERATOR_07172005_0849 +#include <boost/fusion/support/config.hpp> #include <boost/type_traits/add_const.hpp> #include <boost/fusion/support/iterator_base.hpp> #include <boost/fusion/container/list/detail/deref_impl.hpp> @@ -18,14 +19,14 @@ namespace boost { namespace fusion { - struct nil; + struct nil_; struct cons_iterator_tag; struct forward_traversal_tag; template <typename Cons> struct cons_iterator_identity; - template <typename Cons = nil> + template <typename Cons = nil_> struct cons_iterator : iterator_base<cons_iterator<Cons> > { typedef cons_iterator_tag fusion_tag; @@ -35,6 +36,7 @@ namespace boost { namespace fusion typename add_const<Cons>::type> identity; + BOOST_FUSION_GPU_ENABLED explicit cons_iterator(cons_type& in_cons) : cons(in_cons) {} @@ -49,40 +51,50 @@ namespace boost { namespace fusion { typedef forward_traversal_tag category; typedef cons_iterator_tag fusion_tag; - typedef nil cons_type; + typedef nil_ cons_type; typedef cons_iterator_identity< - add_const<nil>::type> + add_const<nil_>::type> identity; + BOOST_FUSION_GPU_ENABLED nil_iterator() {} - explicit nil_iterator(nil const&) {} + BOOST_FUSION_GPU_ENABLED + explicit nil_iterator(nil_ const&) {} }; template <> - struct cons_iterator<nil> : nil_iterator + struct cons_iterator<nil_> : nil_iterator { + BOOST_FUSION_GPU_ENABLED cons_iterator() {} - explicit cons_iterator(nil const&) {} + BOOST_FUSION_GPU_ENABLED + explicit cons_iterator(nil_ const&) {} }; template <> - struct cons_iterator<nil const> : nil_iterator + struct cons_iterator<nil_ const> : nil_iterator { + BOOST_FUSION_GPU_ENABLED cons_iterator() {} - explicit cons_iterator(nil const&) {} + BOOST_FUSION_GPU_ENABLED + explicit cons_iterator(nil_ const&) {} }; template <> struct cons_iterator<list<> > : nil_iterator { + BOOST_FUSION_GPU_ENABLED cons_iterator() {} - explicit cons_iterator(nil const&) {} + BOOST_FUSION_GPU_ENABLED + explicit cons_iterator(nil_ const&) {} }; template <> struct cons_iterator<list<> const> : nil_iterator { + BOOST_FUSION_GPU_ENABLED cons_iterator() {} - explicit cons_iterator(nil const&) {} + BOOST_FUSION_GPU_ENABLED + explicit cons_iterator(nil_ const&) {} }; }} |