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/mpl | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-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/mpl')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/iterator/mpl/convert_iterator.hpp | 4 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/iterator/mpl/fusion_iterator.hpp | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/iterator/mpl/convert_iterator.hpp b/3rdParty/Boost/src/boost/fusion/iterator/mpl/convert_iterator.hpp index dd52d4c..54c9ef6 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/mpl/convert_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/mpl/convert_iterator.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_CONVERT_ITERATOR_05062005_1218) #define FUSION_CONVERT_ITERATOR_05062005_1218 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/support/is_iterator.hpp> #include <boost/mpl/if.hpp> #include <boost/mpl/bool.hpp> @@ -30,18 +31,21 @@ namespace boost { namespace fusion >::type type; + BOOST_FUSION_GPU_ENABLED static T const& call(T const& x, mpl::true_) { return x; } + BOOST_FUSION_GPU_ENABLED static mpl_iterator<T> call(T const& /*x*/, mpl::false_) { return mpl_iterator<T>(); } + BOOST_FUSION_GPU_ENABLED static typename mpl::if_< is_fusion_iterator<T> diff --git a/3rdParty/Boost/src/boost/fusion/iterator/mpl/fusion_iterator.hpp b/3rdParty/Boost/src/boost/fusion/iterator/mpl/fusion_iterator.hpp index 82889e0..f8feacf 100644 --- a/3rdParty/Boost/src/boost/fusion/iterator/mpl/fusion_iterator.hpp +++ b/3rdParty/Boost/src/boost/fusion/iterator/mpl/fusion_iterator.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_FUSION_ITERATOR_10012005_1551) #define FUSION_FUSION_ITERATOR_10012005_1551 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/iterator/value_of.hpp> #include <boost/fusion/iterator/next.hpp> #include <boost/fusion/iterator/prior.hpp> |