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/algorithm/auxiliary/copy.hpp | |
| 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/algorithm/auxiliary/copy.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/algorithm/auxiliary/copy.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/algorithm/auxiliary/copy.hpp b/3rdParty/Boost/src/boost/fusion/algorithm/auxiliary/copy.hpp index fd86646..7ac8e6f 100644 --- a/3rdParty/Boost/src/boost/fusion/algorithm/auxiliary/copy.hpp +++ b/3rdParty/Boost/src/boost/fusion/algorithm/auxiliary/copy.hpp @@ -7,6 +7,7 @@ #if !defined(FUSION_COPY_02162011_2308) #define FUSION_COPY_02162011_2308 +#include <boost/fusion/support/config.hpp> #include <boost/fusion/sequence/intrinsic/begin.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp> @@ -33,12 +34,14 @@ namespace boost { namespace fusion typedef typename result_of::end<Seq2>::type end2_type; template <typename I1, typename I2> + BOOST_FUSION_GPU_ENABLED static void call(I1 const&, I2 const&, mpl::true_) { } template <typename I1, typename I2> + BOOST_FUSION_GPU_ENABLED static void call(I1 const& src, I2 const& dest, mpl::false_) { @@ -47,6 +50,7 @@ namespace boost { namespace fusion } template <typename I1, typename I2> + BOOST_FUSION_GPU_ENABLED static void call(I1 const& src, I2 const& dest) { @@ -57,6 +61,7 @@ namespace boost { namespace fusion } template <typename Seq1, typename Seq2> + BOOST_FUSION_GPU_ENABLED inline typename enable_if_c< @@ -69,7 +74,7 @@ namespace boost { namespace fusion copy(Seq1 const& src, Seq2& dest) { BOOST_STATIC_ASSERT( - result_of::size<Seq1>::value == result_of::size<Seq2>::value); + result_of::size<Seq1>::value <= result_of::size<Seq2>::value); detail::sequence_copy< Seq1 const, Seq2>:: |