diff --git a/include/boost/type_index.hpp b/include/boost/type_index.hpp index dce89d8..0310e20 100644 --- a/include/boost/type_index.hpp +++ b/include/boost/type_index.hpp @@ -234,7 +234,7 @@ inline type_index type_id_with_cvr() BOOST_NOEXCEPT { /// Function that works exactly like C++ typeid(rtti_val) call, but returns boost::type_index. /// -/// Retunrs runtime information about specified type. +/// Returns runtime information about specified type. /// /// \b Requirements: RTTI available or Base and Derived classes must be marked with BOOST_TYPE_INDEX_REGISTER_CLASS. /// @@ -249,7 +249,7 @@ inline type_index type_id_with_cvr() BOOST_NOEXCEPT { /// std::cout << ti.pretty_name(); // Outputs 'Derived' /// \endcode /// -/// \param runtime_val Varaible which runtime type must be returned. +/// \param runtime_val Variable which runtime type must be returned. /// \throw Nothing. /// \return boost::typeindex::type_index with information about the specified variable. template 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 635b45d..acc4dbe 100644 --- a/include/boost/type_index/detail/compile_time_type_info.hpp +++ b/include/boost/type_index/detail/compile_time_type_info.hpp @@ -41,8 +41,14 @@ BOOST_PP_EXPAND( BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS BOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING ) #elif defined(_MSC_VER) + +#if defined (BOOST_NO_CXX11_NOEXCEPT) // sizeof("const char *__cdecl boost::detail::ctti<") - 1, sizeof(">::n(void)") - 1 BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS(40, 10, false, "") +#else + // sizeof("const char *__cdecl boost::detail::ctti<") - 1, sizeof(" >::n(void) noexcept") - 1 + BOOST_TYPE_INDEX_REGISTER_CTTI_PARSING_PARAMS(40, 20, false, "") +#endif #elif defined(__clang__) && defined(__APPLE__) // Someone made __clang_major__ equal to LLVM version rather than compiler version // on APPLE platform.