feedc0de/boost_mp11
1
0
Fork 0
forked from boostorg/mp11
Code Pull Requests Activity

Do not use auto on g++ 4.7 in mp_plus

Browse Source
This commit is contained in:
Peter Dimov
2017-05-24 03:47:24 +03:00
parent 2bd7393365
commit b306ab25aa
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/mp11/detail/mp_plus.hpp
View File

@@ -9,6 +9,7 @@
// http://www.boost.org/LICENSE_1_0.txt // http://www.boost.org/LICENSE_1_0.txt
#include <boost/mp11/detail/config.hpp> #include <boost/mp11/detail/config.hpp>
#include <boost/detail/workaround.hpp>
#include <type_traits> #include <type_traits>
namespace boost namespace boost
@@ -37,6 +38,24 @@ template<> struct mp_plus_impl<>
using type = std::integral_constant<int, 0>; using type = std::integral_constant<int, 0>;
}; };
#if BOOST_WORKAROUND( BOOST_GCC, < 40800 )
template<class T1, class... T> struct mp_plus_impl<T1, T...>
{
static const decltype(T1::value + mp_plus_impl<T...>::type::value) _v = T1::value + mp_plus_impl<T...>::type::value;
using type = std::integral_constant<typename std::remove_const<decltype(_v)>::type, _v>;
};
template<class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class... T> struct mp_plus_impl<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T...>
{
static const
decltype(T1::value + T2::value + T3::value + T4::value + T5::value + T6::value + T7::value + T8::value + T9::value + T10::value + mp_plus_impl<T...>::type::value)
_v = T1::value + T2::value + T3::value + T4::value + T5::value + T6::value + T7::value + T8::value + T9::value + T10::value + mp_plus_impl<T...>::type::value;
using type = std::integral_constant<typename std::remove_const<decltype(_v)>::type, _v>;
};
#else
template<class T1, class... T> struct mp_plus_impl<T1, T...> template<class T1, class... T> struct mp_plus_impl<T1, T...>
{ {
static const auto _v = T1::value + mp_plus_impl<T...>::type::value; static const auto _v = T1::value + mp_plus_impl<T...>::type::value;
@@ -51,6 +70,8 @@ template<class T1, class T2, class T3, class T4, class T5, class T6, class T7, c
#endif #endif
#endif
} // namespace detail } // namespace detail
template<class... T> using mp_plus = typename detail::mp_plus_impl<T...>::type; template<class... T> using mp_plus = typename detail::mp_plus_impl<T...>::type;