Ticket #10346: any_without_rtti.patch

boost/boost/any.hpp

@@ -15 +15 @@
 // when:  July 2001, April 2013 - May 2013
 
 #include <algorithm>
-#include <typeinfo>
 
 #include "boost/config.hpp"
 #include <boost/type_traits/remove_reference.hpp>
@@ -28 +27 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_const.hpp>
+#include <boost/core/typeinfo.hpp>
 
 // See boost/python/type_id.hpp
 // TODO: add BOOST_TYPEID_COMPARE_BY_NAME to config.hpp
@@ -144 +144 @@
             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 +165 @@
 
         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 +189 @@
 #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 +247 @@
     {
         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<any::holder<ValueType> *>(operand->content)->held
             : 0;