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/sequence/convert.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/sequence/convert.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/sequence/convert.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/sequence/convert.hpp b/3rdParty/Boost/src/boost/fusion/sequence/convert.hpp index 5264810..461b921 100644 --- a/3rdParty/Boost/src/boost/fusion/sequence/convert.hpp +++ b/3rdParty/Boost/src/boost/fusion/sequence/convert.hpp @@ -20,15 +20,16 @@ namespace boost { namespace fusion template <typename Tag, typename Sequence> struct convert { - typedef typename extension::convert_impl<Tag> gen; - typedef typename - gen::template apply<Sequence>::type - type; + extension::convert_impl<Tag>::template apply<Sequence> + gen; + + typedef typename gen::type type; }; } template <typename Tag, typename Sequence> + BOOST_FUSION_GPU_ENABLED inline typename result_of::convert<Tag, Sequence>::type convert(Sequence& seq) { @@ -37,6 +38,7 @@ namespace boost { namespace fusion } template <typename Tag, typename Sequence> + BOOST_FUSION_GPU_ENABLED inline typename result_of::convert<Tag, Sequence const>::type convert(Sequence const& seq) { |