From 5eb048669979ebb7874f115c0854908eca2521e3 Mon Sep 17 00:00:00 2001
From: Bryce Adelstein-Lelbach <blelbach@cct.lsu.edu>
Date: Sun, 5 Jun 2011 19:13:25 +0000
Subject: [PATCH] Merge from trunk.

[SVN r72423]
---
 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 6057249..0dc2502 100644
--- a/include/boost/type_traits/intrinsics.hpp
+++ b/include/boost/type_traits/intrinsics.hpp
@@ -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>