diff --git a/include/boost/type_index/detail/compile_time_type_info.hpp b/include/boost/type_index/detail/compile_time_type_info.hpp index 122a2ac..a2a89ae 100644 --- a/include/boost/type_index/detail/compile_time_type_info.hpp +++ b/include/boost/type_index/detail/compile_time_type_info.hpp @@ -60,8 +60,8 @@ // note: checked on 3.1, 3.4 BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS(39, 1, true, "T = ") #elif defined(__GNUC__) && !defined(BOOST_NO_CXX14_CONSTEXPR) - // sizeof("static contexpr char boost::detail::ctti::s() [with long unsigned int I = 0ul; T = ") - 1, sizeof("]") - 1 - BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS(87, 1, false, "") + // sizeof("static contexpr char boost::detail::ctti::s() [with unsigned int I = 0u; T = ") - 1, sizeof("]") - 1 + BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS(81, 1, false, "") #elif defined(__GNUC__) && defined(BOOST_NO_CXX14_CONSTEXPR) // sizeof("static const char* boost::detail::ctti::n() [with T = ") - 1, sizeof("]") - 1 BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS(57, 1, false, "") @@ -94,7 +94,7 @@ namespace boost { namespace typeindex { namespace detail { ); } - template + template BOOST_CXX14_CONSTEXPR inline const char* skip_begining_runtime(const char* begin, boost::mpl::false_) BOOST_NOEXCEPT { return begin; } @@ -136,7 +136,7 @@ namespace boost { namespace typeindex { namespace detail { return static_cast(*v1) - *v2; } - template + template BOOST_CXX14_CONSTEXPR inline const char* skip_begining_runtime(const char* begin, boost::mpl::true_) BOOST_NOEXCEPT { const char* const it = constexpr_search( begin, begin + ArrayLength, @@ -145,7 +145,7 @@ namespace boost { namespace typeindex { namespace detail { return (it == begin + ArrayLength ? begin : it + sizeof(ctti_skip_until_runtime) - 1); } - template + template BOOST_CXX14_CONSTEXPR inline const char* skip_begining(const char* begin) BOOST_NOEXCEPT { assert_compile_time_legths<(ArrayLength > ctti_skip_size_at_begin + ctti_skip_size_at_end)>(); return skip_begining_runtime( @@ -155,18 +155,18 @@ namespace boost { namespace typeindex { namespace detail { } #if !defined(__clang__) && defined(__GNUC__) && !defined(BOOST_NO_CXX14_CONSTEXPR) - template + template struct index_seq {}; template struct make_index_sequence_join; - template + template struct make_index_sequence_join, index_seq > { typedef index_seq type; }; - template + template struct make_index_seq_impl { typedef typename make_index_sequence_join< typename make_index_seq_impl::type, @@ -174,19 +174,19 @@ namespace boost { namespace typeindex { namespace detail { >::type type; }; - template + template struct make_index_seq_impl { typedef index_seq<> type; }; - template + template struct make_index_seq_impl { typedef index_seq type; }; template struct cstring { - static constexpr std::size_t size_ = sizeof...(C); + static constexpr unsigned int size_ = sizeof...(C); static constexpr char data_[size_] = { C... }; }; @@ -206,9 +206,9 @@ struct ctti { #if !defined(__clang__) && defined(__GNUC__) && !defined(BOOST_NO_CXX14_CONSTEXPR) //helper functions - template + template constexpr static char s() BOOST_NOEXCEPT { // step - constexpr std::size_t offset = + constexpr unsigned int offset = (I >= 10u ? 1u : 0u) + (I >= 100u ? 1u : 0u) + (I >= 1000u ? 1u : 0u) @@ -226,17 +226,17 @@ struct ctti { #endif } - template + template constexpr static const char* impl(::boost::typeindex::detail::index_seq ) BOOST_NOEXCEPT { return ::boost::typeindex::detail::cstring()...>::data_; } - template // `D` means `Dummy` + template // `D` means `Dummy` constexpr static const char* n() BOOST_NOEXCEPT { #if defined(BOOST_TYPE_INDEX_FUNCTION_SIGNATURE) - constexpr std::size_t size = sizeof(BOOST_TYPE_INDEX_FUNCTION_SIGNATURE); + constexpr unsigned int size = sizeof(BOOST_TYPE_INDEX_FUNCTION_SIGNATURE); #elif defined(__FUNCSIG__) - constexpr std::size_t size = sizeof(__FUNCSIG__); + constexpr unsigned int size = sizeof(__FUNCSIG__); #elif defined(__PRETTY_FUNCTION__) \ || defined(__GNUC__) \ || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x5130)) \ @@ -244,7 +244,7 @@ struct ctti { || (defined(__ICC) && (__ICC >= 600)) \ || defined(__ghs__) \ || defined(__DMC__) - constexpr std::size_t size = sizeof(__PRETTY_FUNCTION__); + constexpr unsigned int size = sizeof(__PRETTY_FUNCTION__); #else boost::typeindex::detail::failed_to_get_function_name(); #endif