Merge from trunk.

[SVN r72423]
This commit is contained in:
Bryce Adelstein-Lelbach
2011-06-05 19:13:25 +00:00
parent e1a315e00e
commit 5eb0486699

View File

@ -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>