diff -r 72f5890881c2 boost/boost/any.hpp --- a/boost/boost/any.hpp Tue Aug 12 18:21:49 2014 +0800 +++ b/boost/boost/any.hpp Tue Aug 12 20:13:45 2014 +0800 @@ -15,7 +15,6 @@ // when: July 2001, April 2013 - May 2013 #include -#include #include "boost/config.hpp" #include @@ -28,6 +27,7 @@ #include #include #include +#include // See boost/python/type_id.hpp // TODO: add BOOST_TYPEID_COMPARE_BY_NAME to config.hpp @@ -144,9 +144,9 @@ any().swap(*this); } - const std::type_info & type() const BOOST_NOEXCEPT + const boost::core::typeinfo & type() const BOOST_NOEXCEPT { - return content ? content->type() : typeid(void); + return content ? content->type() : BOOST_CORE_TYPEID(void); } #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -165,7 +165,7 @@ public: // queries - virtual const std::type_info & type() const BOOST_NOEXCEPT = 0; + virtual const boost::core::typeinfo & type() const BOOST_NOEXCEPT = 0; virtual placeholder * clone() const = 0; @@ -189,9 +189,9 @@ #endif public: // queries - virtual const std::type_info & type() const BOOST_NOEXCEPT + virtual const boost::core::typeinfo & type() const BOOST_NOEXCEPT { - return typeid(ValueType); + return BOOST_CORE_TYPEID(ValueType); } virtual placeholder * clone() const @@ -247,9 +247,9 @@ { return operand && #ifdef BOOST_AUX_ANY_TYPE_ID_NAME - std::strcmp(operand->type().name(), typeid(ValueType).name()) == 0 + std::strcmp(operand->type().name(), BOOST_CORE_TYPEID(ValueType).name()) == 0 #else - operand->type() == typeid(ValueType) + operand->type() == BOOST_CORE_TYPEID(ValueType) #endif ? &static_cast *>(operand->content)->held : 0;