feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Further restrict typeinfo workarounds to msvc.

Browse Source
This commit is contained in:
jzmaddock
2020-07-25 19:46:13 +01:00
parent ab7bb5c511
commit 46e0a13496
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/config/detail/suffix.hpp
View File

@@ -529,10 +529,13 @@ namespace boost {
# define BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE_SPEC(t, v) # define BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE_SPEC(t, v)
// When BOOST_NO_STD_TYPEINFO is defined, we can just import // When BOOST_NO_STD_TYPEINFO is defined, we can just import
// the global definition into std namespace: // the global definition into std namespace,
#if defined(BOOST_NO_STD_TYPEINFO) && defined(__cplusplus) // see https://svn.boost.org/trac10/ticket/4115
#if defined(BOOST_NO_STD_TYPEINFO) && defined(__cplusplus) && defined(BOOST_MSVC)
#include <typeinfo> #include <typeinfo>
namespace std{ using ::type_info; } namespace std{ using ::type_info; }
// Since we do now have typeinfo, undef the macro:
#undef BOOST_NO_STD_TYPEINFO
#endif #endif
// ---------------------------------------------------------------------------// // ---------------------------------------------------------------------------//

10
include/boost/config/stdlib/dinkumware.hpp
View File

@@ -86,22 +86,24 @@
# define BOOST_NO_STD_LOCALE # define BOOST_NO_STD_LOCALE
#endif #endif
#if BOOST_MSVC < 1800 #if ((defined(BOOST_MSVC) && BOOST_MSVC >= 1400) || (defined(__clang__) && defined(_MSC_VER))) && (_MSC_VER < 1800)
// Fix for VC++ 8.0 on up ( I do not have a previous version to test ) // 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 // or clang-cl. If exceptions are off you must manually include the
// <exception> header before including the <typeinfo> header. Admittedly // <exception> header before including the <typeinfo> header. Admittedly
// trying to use Boost libraries or the standard C++ libraries without // trying to use Boost libraries or the standard C++ libraries without
// exception support is not suggested but currently clang-cl ( v 3.4 ) // exception support is not suggested but currently clang-cl ( v 3.4 )
// does not support exceptions and must be compiled with exceptions off. // 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))) #if !_HAS_EXCEPTIONS
#include <exception> #include <exception>
#endif #endif
#include <typeinfo> #include <typeinfo>
#if ( (!_HAS_EXCEPTIONS && !defined(__ghs__)) || (defined(__ghs__) && !_HAS_NAMESPACE) ) && !defined(__TI_COMPILER_VERSION__) && !defined(__VISUALDSPVERSION__) \ #if !_HAS_EXCEPTIONS
&& !defined(__VXWORKS__) && !defined(BOOST_EMBTC_WINDOWS)
# define BOOST_NO_STD_TYPEINFO # define BOOST_NO_STD_TYPEINFO
#endif #endif
#endif #endif
#if defined(__ghs__) && !_HAS_NAMESPACE
# define BOOST_NO_STD_TYPEINFO
#endif
// C++0x headers implemented in 520 (as shipped by Microsoft) // C++0x headers implemented in 520 (as shipped by Microsoft)
// //