diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:33:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:36:09 +0900 |
| commit | d9ec475d945d3035377a0d89ed42e382d8988891 (patch) | |
| tree | 34aff2cee4b209906243ab5499d61f3edee2982f /boost/core/demangle.hpp | |
| parent | 71d216b90256936a9638f325af9bc69d720e75de (diff) | |
| download | boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.gz boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.bz2 boost-d9ec475d945d3035377a0d89ed42e382d8988891.zip | |
Imported Upstream version 1.60.0
Change-Id: Ie709530d6d5841088ceaba025cbe175a4ef43050
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/core/demangle.hpp')
| -rw-r--r-- | boost/core/demangle.hpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/boost/core/demangle.hpp b/boost/core/demangle.hpp index eebd0ce0f1..44aeb8ded7 100644 --- a/boost/core/demangle.hpp +++ b/boost/core/demangle.hpp @@ -27,8 +27,15 @@ #if defined( BOOST_CORE_HAS_CXXABI_H ) # include <cxxabi.h> -# include <cstdlib> -# include <cstddef> +// For some archtectures (mips, mips64, x86, x86_64) cxxabi.h in Android NDK is implemented by gabi++ library +// (https://android.googlesource.com/platform/ndk/+/master/sources/cxx-stl/gabi++/), which does not implement +// abi::__cxa_demangle(). We detect this implementation by checking the include guard here. +# if defined( __GABIXX_CXXABI_H__ ) +# undef BOOST_CORE_HAS_CXXABI_H +# else +# include <cstdlib> +# include <cstddef> +# endif #endif namespace boost |