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/vector/detail/vector_forward_ctor.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/vector/detail/vector_forward_ctor.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/vector/detail/vector_forward_ctor.hpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/container/vector/detail/vector_forward_ctor.hpp b/3rdParty/Boost/src/boost/fusion/container/vector/detail/vector_forward_ctor.hpp index c41d5b2..976e2a1 100644 --- a/3rdParty/Boost/src/boost/fusion/container/vector/detail/vector_forward_ctor.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/vector/detail/vector_forward_ctor.hpp @@ -1,25 +1,21 @@ /*============================================================================= Copyright (c) 2001-2011 Joel de Guzman - Distributed under the Boost Software License, Version 1.0. (See accompanying + Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ #ifndef BOOST_PP_IS_ITERATING #if !defined(FUSION_VECTOR_FORWARD_CTOR_07122005_1123) #define FUSION_VECTOR_FORWARD_CTOR_07122005_1123 -#include <boost/preprocessor/iterate.hpp> -#include <boost/preprocessor/repetition/enum_params.hpp> -#include <boost/preprocessor/repetition/enum_binary_params.hpp> - -#define FUSION_FORWARD_CTOR_MOVE(z, n, _) std::move(_##n) +#define FUSION_FORWARD_CTOR_FORWARD(z, n, _) std::forward<U##n>(_##n) #define BOOST_PP_FILENAME_1 \ <boost/fusion/container/vector/detail/vector_forward_ctor.hpp> #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE) #include BOOST_PP_ITERATE() -#undef FUSION_FORWARD_CTOR_MOVE +#undef FUSION_FORWARD_CTOR_FORWARD #endif #else // defined(BOOST_PP_IS_ITERATING) /////////////////////////////////////////////////////////////////////////////// @@ -28,23 +24,32 @@ // /////////////////////////////////////////////////////////////////////////////// -#define N BOOST_PP_ITERATION() +#define M BOOST_PP_ITERATION() -#if N == 1 + BOOST_FUSION_GPU_ENABLED +#if M == 1 explicit #endif vector(BOOST_PP_ENUM_BINARY_PARAMS( - N, typename detail::call_param<T, >::type _)) - : vec(BOOST_PP_ENUM_PARAMS(N, _)) {} + M, typename detail::call_param<T, >::type _)) + : vec(BOOST_PP_ENUM_PARAMS(M, _)) {} -#if !defined(BOOST_NO_RVALUE_REFERENCES) -#if N == 1 +#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) +FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) +#endif +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \ + (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)) + template <BOOST_PP_ENUM_PARAMS(M, typename U)> + BOOST_FUSION_GPU_ENABLED +#if M == 1 explicit #endif - vector(BOOST_PP_ENUM_BINARY_PARAMS(N, T, && _)) - : vec(BOOST_PP_ENUM(N, FUSION_FORWARD_CTOR_MOVE, _)) {} + vector(BOOST_PP_ENUM_BINARY_PARAMS(M, U, && _)) + : vec(BOOST_PP_ENUM(M, FUSION_FORWARD_CTOR_FORWARD, _)) {} +#endif +#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) +FUSION_HASH endif #endif -#undef N +#undef M #endif // defined(BOOST_PP_IS_ITERATING) - |