PR libstdc++/46718
* include/std/type_traits (__is_nullptr_t): Add.
(is_scalar): Use the latter.
* testsuite/20_util/is_scalar/value.cc: New.
* testsuite/20_util/is_scalar/requirements/typedefs.cc: Likewise.
* testsuite/20_util/is_scalar/requirements/explicit_instantiation.cc:
Likewise.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167294
138bc75d-0d04-0410-961f-
82ee72b054a4
+2010-11-30 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR libstdc++/46718
+ * include/std/type_traits (__is_nullptr_t): Add.
+ (is_scalar): Use the latter.
+ * testsuite/20_util/is_scalar/value.cc: New.
+ * testsuite/20_util/is_scalar/requirements/typedefs.cc: Likewise.
+ * testsuite/20_util/is_scalar/requirements/explicit_instantiation.cc:
+ Likewise.
+ * testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
+ Adjust dg-error line numbers.
+ * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
+ Likewise.
+ * testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
+
2010-11-28 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/46689
struct is_function<_Res(_ArgTypes......) const volatile>
: public true_type { };
+ template<typename>
+ struct __is_nullptr_t_helper
+ : public false_type { };
+ _DEFINE_SPEC(0, __is_nullptr_t_helper, std::nullptr_t, true)
+
+ // __is_nullptr_t (extension).
+ template<typename _Tp>
+ struct __is_nullptr_t
+ : public integral_constant<bool, (__is_nullptr_t_helper<typename
+ remove_cv<_Tp>::type>::value)>
+ { };
+
// composite type traits.
/// is_arithmetic
: public integral_constant<bool, (is_arithmetic<_Tp>::value
|| is_enum<_Tp>::value
|| is_pointer<_Tp>::value
- || is_member_pointer<_Tp>::value)>
+ || is_member_pointer<_Tp>::value
+ || __is_nullptr_t<_Tp>::value)>
{ };
/// is_compound
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-error "static assertion failed" "" { target *-*-* } 1119 }
+// { dg-error "static assertion failed" "" { target *-*-* } 1132 }
#include <utility>
--- /dev/null
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// NB: This file is for testing type_traits with NO OTHER INCLUDES.
+
+#include <type_traits>
+
+namespace std
+{
+ typedef short test_type;
+ template struct is_scalar<test_type>;
+}
--- /dev/null
+// 2010-11-30 Paolo Carlini <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+//
+// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
+
+#include <type_traits>
+
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+void test01()
+{
+ // Check for required typedefs
+ typedef std::is_scalar<int> test_type;
+ typedef test_type::value_type value_type;
+ typedef test_type::type type;
+ typedef test_type::type::value_type type_value_type;
+ typedef test_type::type::type type_type;
+}
--- /dev/null
+// { dg-options "-std=gnu++0x" }
+// 2010-11-30 Paolo Carlini <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using std::is_scalar;
+ using namespace __gnu_test;
+
+ VERIFY( (test_category<is_scalar, int>(true)) );
+ VERIFY( (test_category<is_scalar, float>(true)) );
+ VERIFY( (test_category<is_scalar, EnumType>(true)) );
+ VERIFY( (test_category<is_scalar, int*>(true)) );
+ VERIFY( (test_category<is_scalar, int(*)(int)>(true)) );
+ VERIFY( (test_category<is_scalar, int (ClassType::*)>(true)) );
+ VERIFY( (test_category<is_scalar, int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_category<is_scalar, std::nullptr_t>(true)) );
+
+ // Sanity check.
+ VERIFY( (test_category<is_scalar, ClassType>(false)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
// { dg-error "instantiated from here" "" { target *-*-* } 40 }
// { dg-error "instantiated from here" "" { target *-*-* } 42 }
-// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1082 }
-// { dg-error "declaration of" "" { target *-*-* } 1046 }
+// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1095 }
+// { dg-error "declaration of" "" { target *-*-* } 1059 }
// { dg-error "instantiated from here" "" { target *-*-* } 40 }
// { dg-error "instantiated from here" "" { target *-*-* } 42 }
-// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1005 }
-// { dg-error "declaration of" "" { target *-*-* } 969 }
+// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1018 }
+// { dg-error "declaration of" "" { target *-*-* } 982 }
OSDN Git Service
