From 9e8c421f8f132a172aaf9471628ad548c24d252b Mon Sep 17 00:00:00 2001 From: Nikita Kniazev Date: Mon, 2 Dec 2019 20:23:29 +0300 Subject: [PATCH] Do not inject `typeinfo` into `std` namespace `BOOST_NO_STD_TYPEINFO` should be used to detect if there is no `typeinfo` in `std` namespace, or Boost.Core/Boost.TypeInfo wrappers for a portable solution. --- include/boost/config/detail/suffix.hpp | 6 ------ include/boost/config/stdlib/dinkumware.hpp | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/include/boost/config/detail/suffix.hpp b/include/boost/config/detail/suffix.hpp index 47e139b4e..ee5756415 100644 --- a/include/boost/config/detail/suffix.hpp +++ b/include/boost/config/detail/suffix.hpp @@ -528,12 +528,6 @@ namespace boost { # define BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(t, v) # define BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE_SPEC(t, v) -// When BOOST_NO_STD_TYPEINFO is defined, we can just import -// the global definition into std namespace: -#if defined(BOOST_NO_STD_TYPEINFO) && defined(__cplusplus) -#include -namespace std{ using ::type_info; } -#endif // ---------------------------------------------------------------------------// diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp index 7d565653b..9b629ee9e 100644 --- a/include/boost/config/stdlib/dinkumware.hpp +++ b/include/boost/config/stdlib/dinkumware.hpp @@ -86,16 +86,6 @@ # define BOOST_NO_STD_LOCALE #endif -// Fix for VC++ 8.0 on up ( I do not have a previous version to test ) -// or clang-cl. If exceptions are off you must manually include the -// header before including the header. Admittedly -// trying to use Boost libraries or the standard C++ libraries without -// exception support is not suggested but currently clang-cl ( v 3.4 ) -// does not support exceptions and must be compiled with exceptions off. -#if !_HAS_EXCEPTIONS && ((defined(BOOST_MSVC) && BOOST_MSVC >= 1400) || (defined(__clang__) && defined(_MSC_VER))) -#include -#endif -#include #if ( (!_HAS_EXCEPTIONS && !defined(__ghs__)) || (defined(__ghs__) && !_HAS_NAMESPACE) ) && !defined(__TI_COMPILER_VERSION__) && !defined(__VISUALDSPVERSION__) \ && !defined(__VXWORKS__) # define BOOST_NO_STD_TYPEINFO