Index: boost/units/detail/utility.hpp =================================================================== --- boost/units/detail/utility.hpp (revision 73527) +++ boost/units/detail/utility.hpp (working copy) @@ -15,10 +15,17 @@ #include #include -#if defined(__GLIBCXX__) || defined(__GLIBCPP__) -#define BOOST_UNITS_USE_DEMANGLING -#include -#endif // __GNUC__ +#if defined(__has_include) + #if __has_include() + #define BOOST_UNITS_USE_DEMANGLING + #include + #endif // __clang__ +#else + #if defined(__GLIBCXX__) || defined(__GLIBCPP__) + #define BOOST_UNITS_USE_DEMANGLING + #include + #endif // __GNUC__ +#endif #ifdef BOOST_UNITS_USE_DEMANGLING