[Boost-commit] svn:boost r72423 - branches/release/boost/type_traits

Subject: [Boost-commit] svn:boost r72423 - branches/release/boost/type_traits
From: blelbach_at_[hidden]
Date: 2011-06-05 15:13:25

Author: wash
Date: 2011-06-05 15:13:25 EDT (Sun, 05 Jun 2011)
New Revision: 72423
URL: http://svn.boost.org/trac/boost/changeset/72423

Log:
Merge from trunk.

Text files modified: 
   branches/release/boost/type_traits/intrinsics.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: branches/release/boost/type_traits/intrinsics.hpp
==============================================================================
--- branches/release/boost/type_traits/intrinsics.hpp	(original)
+++ branches/release/boost/type_traits/intrinsics.hpp	2011-06-05 15:13:25 EDT (Sun, 05 Jun 2011)
@@ -124,7 +124,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__)))) || (__clang_major__ >= 3)
 #   include <boost/type_traits/is_same.hpp>
 #   include <boost/type_traits/is_reference.hpp>
 #   include <boost/type_traits/is_volatile.hpp>