summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/std/type_traits
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2013-03-13 11:15:45 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2013-03-13 11:15:45 +0000
commit0c5ef4f7ba785318fccc8c2e593443f7498fe7d4 (patch)
tree4fa0415623ffea17fc5a15fb0cf02b13d5d0050f /libstdc++-v3/include/std/type_traits
parent043cabe3b26006cb367d2a1663d7f0b8d47489f7 (diff)
downloadppe42-gcc-0c5ef4f7ba785318fccc8c2e593443f7498fe7d4.tar.gz
ppe42-gcc-0c5ef4f7ba785318fccc8c2e593443f7498fe7d4.zip
2013-03-13 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/56609 * include/std/type_traits (is_fundamental): Add std::nullptr_t. * testsuite/20_util/is_fundamental/value.cc: Extend. * testsuite/20_util/is_compound/value.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196630 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/type_traits')
-rw-r--r--libstdc++-v3/include/std/type_traits2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 62d59128f9f..334b8d0ab38 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -444,7 +444,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// is_fundamental
template<typename _Tp>
struct is_fundamental
- : public __or_<is_arithmetic<_Tp>, is_void<_Tp>>::type
+ : public __or_<is_arithmetic<_Tp>, is_void<_Tp>, __is_nullptr_t<_Tp>>::type
{ };
/// is_object
OpenPOWER on IntegriCloud