diff options
Diffstat (limited to 'boost/exception/detail/type_info.hpp')
| -rw-r--r-- | boost/exception/detail/type_info.hpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/boost/exception/detail/type_info.hpp b/boost/exception/detail/type_info.hpp index 92f846468c..b8c7d48bae 100644 --- a/boost/exception/detail/type_info.hpp +++ b/boost/exception/detail/type_info.hpp @@ -5,19 +5,17 @@ #ifndef UUID_C3E1741C754311DDB2834CCA55D89593 #define UUID_C3E1741C754311DDB2834CCA55D89593 -#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) +#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) #pragma GCC system_header #endif #if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) #pragma warning(push,1) #endif -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/core/typeinfo.hpp> +#include <boost/core/demangle.hpp> #include <boost/current_function.hpp> #include <boost/config.hpp> -#ifndef BOOST_NO_TYPEID -#include <boost/units/detail/utility.hpp> -#endif #include <string> namespace @@ -31,7 +29,7 @@ boost #ifdef BOOST_NO_TYPEID return BOOST_CURRENT_FUNCTION; #else - return units::detail::demangle(typeid(T*).name()); + return core::demangle(typeid(T*).name()); #endif } @@ -43,7 +41,7 @@ boost #ifdef BOOST_NO_TYPEID return BOOST_CURRENT_FUNCTION; #else - return units::detail::demangle(typeid(T).name()); + return core::demangle(typeid(T).name()); #endif } @@ -53,10 +51,10 @@ boost struct type_info_ { - detail::sp_typeinfo const * type_; + core::typeinfo const * type_; explicit - type_info_( detail::sp_typeinfo const & type ): + type_info_( core::typeinfo const & type ): type_(&type) { } @@ -71,7 +69,7 @@ boost } } -#define BOOST_EXCEPTION_STATIC_TYPEID(T) ::boost::exception_detail::type_info_(BOOST_SP_TYPEID(T)) +#define BOOST_EXCEPTION_STATIC_TYPEID(T) ::boost::exception_detail::type_info_(BOOST_CORE_TYPEID(T)) #ifndef BOOST_NO_RTTI #define BOOST_EXCEPTION_DYNAMIC_TYPEID(x) ::boost::exception_detail::type_info_(typeid(x)) |