Replace typeid with BOOST_CORE_TYPEID to allow using fc library in a …

…project with -no-rtti
yumenohosi · Nov 15, 2017 · 75fdf0e · 75fdf0e
1 parent 3fd41ba
commit 75fdf0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/libraries/fc/include/fc/exception/exception.hpp b/libraries/fc/include/fc/exception/exception.hpp
@@ -8,6 +8,7 @@
 #include <exception>
 #include <functional>
 #include <unordered_map>
+#include <boost/core/typeinfo.hpp>
 
 namespace fc
 {
@@ -383,7 +384,7 @@ namespace fc
       fc::exception fce( \
                 FC_LOG_MESSAGE( warn, "rethrow ${what}: ", ("what",e.what())), \
                 fc::std_exception_code,\
-                typeid(e).name(), \
+                BOOST_CORE_TYPEID(e).name(), \
                 e.what() ) ; \
       wlog( "${details}", ("details",fce.to_detail_string()) ); \
       throw fce;\
@@ -404,7 +405,7 @@ namespace fc
       fc::exception fce( \
                 FC_LOG_MESSAGE( warn, "rethrow ${what}: ", FC_FORMAT_ARG_PARAMS( __VA_ARGS__ )("what",e.what())), \
                 fc::std_exception_code,\
-                typeid(e).name(), \
+                BOOST_CORE_TYPEID(e).name(), \
                 e.what() ) ; \
       wlog( "${details}", ("details",fce.to_detail_string()) ); \
       wdump( __VA_ARGS__ ); \
@@ -426,7 +427,7 @@ namespace fc
       fc::exception fce( \
                 FC_LOG_MESSAGE( warn, "rethrow ${what}: ",FC_FORMAT_ARG_PARAMS( __VA_ARGS__  )("what",e.what()) ), \
                 fc::std_exception_code,\
-                typeid(e).name(), \
+                BOOST_CORE_TYPEID(e).name(), \
                 e.what() ) ; \
       wlog( "${details}", ("details",fce.to_detail_string()) ); \
       wdump( __VA_ARGS__ ); \
@@ -451,7 +452,7 @@ namespace fc
       fc::exception fce( \
                 FC_LOG_MESSAGE( LOG_LEVEL, "${what}: " FORMAT,__VA_ARGS__("what",e.what())), \
                 fc::std_exception_code,\
-                typeid(e).name(), \
+                BOOST_CORE_TYPEID(e).name(), \
                 e.what() ) ; throw fce;\
    } catch( ... ) {  \
       throw fc::unhandled_exception( \
@@ -466,7 +467,7 @@ namespace fc
       fc::exception fce( \
                 FC_LOG_MESSAGE( warn, "${what}: ",FC_FORMAT_ARG_PARAMS(__VA_ARGS__)("what",e.what())), \
                 fc::std_exception_code,\
-                typeid(e).name(), \
+                BOOST_CORE_TYPEID(decltype(e)).name(), \
                 e.what() ) ; throw fce;\
    } catch( ... ) {  \
       throw fc::unhandled_exception( \

diff --git a/libraries/fc/include/fc/static_variant.hpp b/libraries/fc/include/fc/static_variant.hpp
@@ -13,6 +13,7 @@
 #include <stdexcept>
 #include <typeinfo>
 #include <fc/exception/exception.hpp>
+#include <boost/core/typeinfo.hpp>
 
 namespace fc {
 
@@ -385,5 +386,5 @@ struct visitor {
       s.visit( to_static_variant(ar[1]) );
    }
 
-  template<typename... T> struct get_typename { static const char* name()   { return typeid(static_variant<T...>).name();   } };
+  template<typename... T> struct get_typename { static const char* name()   { return BOOST_CORE_TYPEID(static_variant<T...>).name();   } };
 } // namespace fc