diff options
Diffstat (limited to 'boost/multiprecision/cpp_int/literals.hpp')
| -rw-r--r-- | boost/multiprecision/cpp_int/literals.hpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/boost/multiprecision/cpp_int/literals.hpp b/boost/multiprecision/cpp_int/literals.hpp index 957677adc0..a0b98ccba1 100644 --- a/boost/multiprecision/cpp_int/literals.hpp +++ b/boost/multiprecision/cpp_int/literals.hpp @@ -137,8 +137,8 @@ struct combine_value_to_pack<value_pack<first, ARGS...>, value> template <char NextChar, char... CHARS> struct pack_values { - static constexpr unsigned chars_per_limb = sizeof(limb_type) * CHAR_BIT / 4; - static constexpr unsigned shift = ((sizeof...(CHARS)) % chars_per_limb) * 4; + static constexpr std::size_t chars_per_limb = sizeof(limb_type) * CHAR_BIT / 4; + static constexpr std::size_t shift = ((sizeof...(CHARS)) % chars_per_limb) * 4; static constexpr limb_type value_to_add = shift ? hex_value<NextChar>::value << shift : hex_value<NextChar>::value; using recursive_packed_type = typename pack_values<CHARS...>::type ; @@ -212,8 +212,10 @@ struct make_backend_from_pack static constexpr B value = p; }; +#if !defined(__cpp_inline_variables) template <class Pack, class B> constexpr B make_backend_from_pack<Pack, B>::value; +#endif template <unsigned Digits> struct signed_cpp_int_literal_result_type @@ -234,17 +236,17 @@ struct unsigned_cpp_int_literal_result_type } // namespace detail template <char... STR> -constexpr typename boost::multiprecision::literals::detail::signed_cpp_int_literal_result_type<(sizeof...(STR)) - 2>::number_type operator"" _cppi() +constexpr typename boost::multiprecision::literals::detail::signed_cpp_int_literal_result_type<static_cast<unsigned>((sizeof...(STR)) - 2u)>::number_type operator"" _cppi() { using pt = typename boost::multiprecision::literals::detail::make_packed_value_from_str<STR...>::type; - return boost::multiprecision::literals::detail::make_backend_from_pack<pt, typename boost::multiprecision::literals::detail::signed_cpp_int_literal_result_type<(sizeof...(STR)) - 2>::backend_type>::value; + return boost::multiprecision::literals::detail::make_backend_from_pack<pt, typename boost::multiprecision::literals::detail::signed_cpp_int_literal_result_type<static_cast<unsigned>((sizeof...(STR)) - 2u)>::backend_type>::value; } template <char... STR> -constexpr typename boost::multiprecision::literals::detail::unsigned_cpp_int_literal_result_type<(sizeof...(STR)) - 2>::number_type operator"" _cppui() +constexpr typename boost::multiprecision::literals::detail::unsigned_cpp_int_literal_result_type<static_cast<unsigned>((sizeof...(STR)) - 2u)>::number_type operator"" _cppui() { using pt = typename boost::multiprecision::literals::detail::make_packed_value_from_str<STR...>::type; - return boost::multiprecision::literals::detail::make_backend_from_pack<pt, typename boost::multiprecision::literals::detail::unsigned_cpp_int_literal_result_type<(sizeof...(STR)) - 2>::backend_type>::value; + return boost::multiprecision::literals::detail::make_backend_from_pack<pt, typename boost::multiprecision::literals::detail::unsigned_cpp_int_literal_result_type<static_cast<unsigned>((sizeof...(STR)) - 2u)>::backend_type>::value; } #define BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(Bits) \ @@ -275,13 +277,13 @@ BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(1024) // // Overload unary minus operator for constexpr use: // -template <unsigned MinBits, cpp_int_check_type Checked> +template <std::size_t MinBits, cpp_int_check_type Checked> constexpr number<cpp_int_backend<MinBits, MinBits, signed_magnitude, Checked, void>, et_off> operator-(const number<cpp_int_backend<MinBits, MinBits, signed_magnitude, Checked, void>, et_off>& a) { return cpp_int_backend<MinBits, MinBits, signed_magnitude, Checked, void>(a.backend(), boost::multiprecision::literals::detail::make_negate_tag()); } -template <unsigned MinBits, cpp_int_check_type Checked> +template <std::size_t MinBits, cpp_int_check_type Checked> constexpr number<cpp_int_backend<MinBits, MinBits, signed_magnitude, Checked, void>, et_off> operator-(number<cpp_int_backend<MinBits, MinBits, signed_magnitude, Checked, void>, et_off>&& a) { |