From 960c85dedcf43910894fba2e207e3c96b2f3967f Mon Sep 17 00:00:00 2001 From: Michel Morin Date: Sun, 13 May 2012 05:49:12 +0000 Subject: [PATCH] Explicitly guard gcc's code path using `BOOST_CLANG`. Currently, the version check `(__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)` is enough to guard gcc's code path from clang, since clang pretends to be gcc-4.2.1. But, it seems that the clang's (pretended) gcc version will be changed to a more recent one in the near future. So we need the explicit guard. [SVN r78448] --- include/boost/type_traits/intrinsics.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/type_traits/intrinsics.hpp b/include/boost/type_traits/intrinsics.hpp index 3262c99..8408ec3 100644 --- a/include/boost/type_traits/intrinsics.hpp +++ b/include/boost/type_traits/intrinsics.hpp @@ -186,7 +186,7 @@ # define BOOST_HAS_TYPE_TRAITS_INTRINSICS #endif -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3) && !defined(__GCCXML__))) +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3) && !defined(__GCCXML__))) && !defined(BOOST_CLANG) # include # include # include