diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-01-13 11:58:41 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-01-13 11:58:41 (GMT) |
| commit | 0aa0fe08dc308c94379c47d0bf9745e341cb4c81 (patch) | |
| tree | 514b009d3d1658af6988e059874014fc26fc0395 /contrib/src/boost/core | |
| parent | 6952ce94491e4b7bc2acded0788e4609ca2c76e8 (diff) | |
| download | uscxml-0aa0fe08dc308c94379c47d0bf9745e341cb4c81.zip uscxml-0aa0fe08dc308c94379c47d0bf9745e341cb4c81.tar.gz uscxml-0aa0fe08dc308c94379c47d0bf9745e341cb4c81.tar.bz2 | |
Updated boost headers
Diffstat (limited to 'contrib/src/boost/core')
| -rw-r--r-- | contrib/src/boost/core/demangle.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/src/boost/core/demangle.hpp b/contrib/src/boost/core/demangle.hpp index 44aeb8d..f13c26a 100644 --- a/contrib/src/boost/core/demangle.hpp +++ b/contrib/src/boost/core/demangle.hpp @@ -17,7 +17,10 @@ # pragma once #endif -#if defined( __clang__ ) && defined( __has_include ) +// __has_include is currently supported by GCC and Clang. However GCC 4.9 may have issues and +// returns 1 for 'defined( __has_include )', while '__has_include' is actually not supported: +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63662 +#if defined( __has_include ) && (!defined( BOOST_GCC ) || (__GNUC__ + 0) >= 5) # if __has_include(<cxxabi.h>) # define BOOST_CORE_HAS_CXXABI_H # endif |