From 9797bec93954fd4c7dfb48a4e26b7062fb589f90 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 24 May 2013 18:27:59 +0000 Subject: [PATCH] type_traits.h (__is_null_pointer): Add std::nullptr_t overload. 2013-05-24 Paolo Carlini * include/ext/type_traits.h (__is_null_pointer): Add std::nullptr_t overload. * include/bits/cpp_type_traits.h (__is_fundamental): Remove, unused. From-SVN: r199313 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/cpp_type_traits.h | 8 -------- libstdc++-v3/include/ext/type_traits.h | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7607003546c..43ecc7bb90c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-05-24 Paolo Carlini + + * include/ext/type_traits.h (__is_null_pointer): Add std::nullptr_t + overload. + + * include/bits/cpp_type_traits.h (__is_fundamental): Remove, unused. + 2013-05-24 Jakub Jelinek * src/c++11/chrono.cc: If _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL, diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h index 6c03c9869d0..02a18597be0 100644 --- a/libstdc++-v3/include/bits/cpp_type_traits.h +++ b/libstdc++-v3/include/bits/cpp_type_traits.h @@ -326,14 +326,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > { }; - // - // A fundamental type is `void' or and arithmetic type - // - template - struct __is_fundamental - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> > - { }; - // // A scalar type is an arithmetic type or a pointer type // diff --git a/libstdc++-v3/include/ext/type_traits.h b/libstdc++-v3/include/ext/type_traits.h index 7a840343fca..071ebddd536 100644 --- a/libstdc++-v3/include/ext/type_traits.h +++ b/libstdc++-v3/include/ext/type_traits.h @@ -155,6 +155,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __is_null_pointer(_Type) { return false; } +#if __cplusplus >= 201103L + inline bool + __is_null_pointer(std::nullptr_t) + { return true; } +#endif // For complex and cmath template::__value> -- 2.30.2