diff 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/type_traits/extent.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/type_traits/extent.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/type_traits/extent.hpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/extent.hpp b/3rdParty/Boost/src/boost/type_traits/extent.hpp index 27e8a67..c41f7f2 100644 --- a/3rdParty/Boost/src/boost/type_traits/extent.hpp +++ b/3rdParty/Boost/src/boost/type_traits/extent.hpp @@ -31,7 +31,7 @@ struct extent_imp { BOOST_STATIC_CONSTANT(std::size_t, value = 0); }; -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS) +#if !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS) template <class T, std::size_t R, std::size_t N> struct extent_imp<T[R], N> { @@ -131,10 +131,6 @@ template <class T, std::size_t N = 0> struct extent : public ::boost::integral_constant<std::size_t, ::boost::detail::extent_imp<T,N>::value> { -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - typedef ::boost::integral_constant<std::size_t, ::boost::detail::extent_imp<T,N>::value> base_; - using base_::value; -#endif BOOST_MPL_AUX_LAMBDA_SUPPORT(1,extent,(T)) }; |