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/generation/make_vector.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/generation/make_vector.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/generation/make_vector.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/container/generation/make_vector.hpp b/3rdParty/Boost/src/boost/fusion/container/generation/make_vector.hpp index a6fd832..4911f4b 100644 --- a/3rdParty/Boost/src/boost/fusion/container/generation/make_vector.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/generation/make_vector.hpp @@ -56,7 +56,7 @@ namespace boost { namespace fusion }; } - inline vector0<> + BOOST_FUSION_GPU_ENABLED inline vector0<> make_vector() { return vector0<>(); @@ -92,19 +92,16 @@ namespace boost { namespace fusion namespace result_of { template <BOOST_PP_ENUM_PARAMS(N, typename T)> -#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS) #define TEXT(z, n, text) , text struct make_vector< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_VECTOR_SIZE, TEXT, void_) > #undef TEXT -#else - struct make_vector<BOOST_PP_ENUM_PARAMS(N, T)> -#endif { typedef BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM(N, BOOST_FUSION_AS_FUSION_ELEMENT, _)> type; }; } template <BOOST_PP_ENUM_PARAMS(N, typename T)> + BOOST_FUSION_GPU_ENABLED inline BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM(N, BOOST_FUSION_AS_FUSION_ELEMENT, _)> make_vector(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& _)) { |