[Boost-commit] svn:boost r78448 - trunk/boost/type_traits

Subject: [Boost-commit] svn:boost r78448 - trunk/boost/type_traits
From: mimomorin_at_[hidden]
Date: 2012-05-13 01:49:13

Author: michel
Date: 2012-05-13 01:49:12 EDT (Sun, 13 May 2012)
New Revision: 78448
URL: http://svn.boost.org/trac/boost/changeset/78448

Log:
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.
Text files modified: 
   trunk/boost/type_traits/intrinsics.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: trunk/boost/type_traits/intrinsics.hpp
==============================================================================
--- trunk/boost/type_traits/intrinsics.hpp	(original)
+++ trunk/boost/type_traits/intrinsics.hpp	2012-05-13 01:49:12 EDT (Sun, 13 May 2012)
@@ -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 <boost/type_traits/is_same.hpp>
 #   include <boost/type_traits/is_reference.hpp>
 #   include <boost/type_traits/is_volatile.hpp>