From d6c80dec764ef3aabce74a7b52fd6513964d4e1d Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Wed, 9 Mar 2011 15:10:51 +0000
Subject: [PATCH] Walter Brown brought to my attention that type_traits was
 failing to correctly classify nullptr_t

llvm-svn: 127334
---
 libcxx/include/type_traits | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
index e1cd1e150ec5..d522b29a01d5 100644
--- a/libcxx/include/type_traits
+++ b/libcxx/include/type_traits
@@ -395,6 +395,9 @@ template <class _Tp> struct _LIBCPP_VISIBLE is_fundamental
     : public integral_constant<bool, is_void<_Tp>::value      ||
                                      is_arithmetic<_Tp>::value> {};
 
+template <> struct _LIBCPP_VISIBLE is_fundamental<nullptr_t>
+    : public true_type {};
+
 // is_scalar
 
 template <class _Tp> struct _LIBCPP_VISIBLE is_scalar
@@ -403,6 +406,8 @@ template <class _Tp> struct _LIBCPP_VISIBLE is_scalar
                                      is_pointer<_Tp>::value        ||
                                      is_enum<_Tp>::value           > {};
 
+template <> struct _LIBCPP_VISIBLE is_scalar<nullptr_t> : public true_type {};
+
 // is_object
 
 template <class _Tp> struct _LIBCPP_VISIBLE is_object