summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxx/include/type_traits5
1 files changed, 5 insertions, 0 deletions
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
index e1cd1e150ec..d522b29a01d 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
OpenPOWER on IntegriCloud