This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] tr1/type_traits: has_trivial_copy/assign, has_nothrow_copy/assign
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 31 Dec 2004 00:32:04 +0100
- Subject: [v3] tr1/type_traits: has_trivial_copy/assign, has_nothrow_copy/assign
Hi,
tested x86-linux, committed.
Paolo.
////////////////
2004-12-30 Paolo Carlini <pcarlini@suse.de>
* include/tr1/type_traits: Add has_trivial_copy, has_trivial_assign,
has_nothrow_copy, has_nothrow_assign.
* testsuite/testsuite_tr1.h: Add test_copy_property and
test_assign_property.
* testsuite/tr1/4_metaprogramming/type_properties/
has_nothrow_assign/has_nothrow_assign.cc: New.
* testsuite/tr1/4_metaprogramming/type_properties/
has_nothrow_assign/typedefs.cc: Likewise.
* testsuite/tr1/4_metaprogramming/type_properties/
has_nothrow_copy/has_nothrow_copy.cc: Likewise.
* testsuite/tr1/4_metaprogramming/type_properties/
has_nothrow_copy/typedefs.cc: Likewise.
* testsuite/tr1/4_metaprogramming/type_properties/
has_trivial_assign/has_trivial_assign.cc: Likewise.
* testsuite/tr1/4_metaprogramming/type_properties/
has_trivial_assign/typedefs.cc: Likewise.
* testsuite/tr1/4_metaprogramming/type_properties/
has_trivial_copy/has_trivial_copy.cc: Likewise.
* testsuite/tr1/4_metaprogramming/type_properties/
has_trivial_copy/typedefs.cc: Likewise.
diff -urN libstdc++-v3-orig/include/tr1/type_traits libstdc++-v3/include/tr1/type_traits
--- libstdc++-v3-orig/include/tr1/type_traits 2004-12-29 13:11:27.000000000 +0100
+++ libstdc++-v3/include/tr1/type_traits 2004-12-30 23:35:37.000000000 +0100
@@ -277,6 +277,17 @@
: public integral_constant<bool, is_pod<_Tp>::value> { };
template<typename _Tp>
+ struct has_trivial_copy
+ : public integral_constant<bool, (is_pod<_Tp>::value
+ && !is_volatile<_Tp>::value)> { };
+
+ template<typename _Tp>
+ struct has_trivial_assign
+ : public integral_constant<bool, (is_pod<_Tp>::value
+ && !is_const<_Tp>::value
+ && !is_volatile<_Tp>::value)> { };
+
+ template<typename _Tp>
struct has_trivial_destructor
: public integral_constant<bool, is_pod<_Tp>::value> { };
@@ -284,6 +295,17 @@
struct has_nothrow_constructor
: public integral_constant<bool, is_pod<_Tp>::value> { };
+ template<typename _Tp>
+ struct has_nothrow_copy
+ : public integral_constant<bool, (is_pod<_Tp>::value
+ && !is_volatile<_Tp>::value)> { };
+
+ template<typename _Tp>
+ struct has_nothrow_assign
+ : public integral_constant<bool, (is_pod<_Tp>::value
+ && !is_const<_Tp>::value
+ && !is_volatile<_Tp>::value)> { };
+
template<typename>
struct has_virtual_destructor
: public false_type { };
diff -urN libstdc++-v3-orig/testsuite/testsuite_tr1.h libstdc++-v3/testsuite/testsuite_tr1.h
--- libstdc++-v3-orig/testsuite/testsuite_tr1.h 2004-12-25 16:24:32.000000000 +0100
+++ libstdc++-v3/testsuite/testsuite_tr1.h 2004-12-30 23:36:20.000000000 +0100
@@ -62,6 +62,40 @@
return ret;
}
+ template<template<typename> class Property,
+ typename Type>
+ bool
+ test_copy_property(bool value)
+ {
+ bool ret = true;
+ ret &= Property<Type>::value == value;
+ ret &= Property<const Type>::value == value;
+ ret &= Property<volatile Type>::value == !value;
+ ret &= Property<const volatile Type>::value == !value;
+ ret &= Property<Type>::type::value == value;
+ ret &= Property<const Type>::type::value == value;
+ ret &= Property<volatile Type>::type::value == !value;
+ ret &= Property<const volatile Type>::type::value == !value;
+ return ret;
+ }
+
+ template<template<typename> class Property,
+ typename Type>
+ bool
+ test_assign_property(bool value)
+ {
+ bool ret = true;
+ ret &= Property<Type>::value == value;
+ ret &= Property<const Type>::value == !value;
+ ret &= Property<volatile Type>::value == !value;
+ ret &= Property<const volatile Type>::value == !value;
+ ret &= Property<Type>::type::value == value;
+ ret &= Property<const Type>::type::value == !value;
+ ret &= Property<volatile Type>::type::value == !value;
+ ret &= Property<const volatile Type>::type::value == !value;
+ return ret;
+ }
+
template<template<typename, typename> class Relationship,
typename Type1, typename Type2>
bool
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc 2004-12-31 00:02:07.000000000 +0100
@@ -0,0 +1,59 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 4.5.3 Type properties
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using std::tr1::has_nothrow_assign;
+ using namespace __gnu_test;
+
+ VERIFY( (test_assign_property<has_nothrow_assign, void>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, float>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, EnumType>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int*>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int(*)(int)>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_assign_property<has_nothrow_assign,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int[2]>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, float[][3]>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int*[3]>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign, int(*[][2])(int)>(true)) );
+ VERIFY( (test_assign_property<has_nothrow_assign,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_assign_property<has_nothrow_assign,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc 2004-12-30 23:29:40.000000000 +0100
@@ -0,0 +1,36 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+//
+// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
+
+#include <tr1/type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+ // Check for required typedefs
+ typedef std::tr1::has_nothrow_assign<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;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc 2004-12-31 00:02:20.000000000 +0100
@@ -0,0 +1,59 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 4.5.3 Type properties
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using std::tr1::has_nothrow_copy;
+ using namespace __gnu_test;
+
+ VERIFY( (test_copy_property<has_nothrow_copy, void>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, float>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, EnumType>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int*>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int(*)(int)>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_copy_property<has_nothrow_copy,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int[2]>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, float[][3]>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int*[3]>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy, int(*[][2])(int)>(true)) );
+ VERIFY( (test_copy_property<has_nothrow_copy,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_copy_property<has_nothrow_copy,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc 2004-12-30 23:07:52.000000000 +0100
@@ -0,0 +1,36 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+//
+// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
+
+#include <tr1/type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+ // Check for required typedefs
+ typedef std::tr1::has_nothrow_copy<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;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc 2004-12-31 00:02:38.000000000 +0100
@@ -0,0 +1,59 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 4.5.3 Type properties
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using std::tr1::has_trivial_assign;
+ using namespace __gnu_test;
+
+ VERIFY( (test_assign_property<has_trivial_assign, void>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, float>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, EnumType>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int*>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int(*)(int)>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_assign_property<has_trivial_assign,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int[2]>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, float[][3]>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int*[3]>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign, int(*[][2])(int)>(true)) );
+ VERIFY( (test_assign_property<has_trivial_assign,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_assign_property<has_trivial_assign,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc 2004-12-30 23:32:30.000000000 +0100
@@ -0,0 +1,36 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+//
+// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
+
+#include <tr1/type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+ // Check for required typedefs
+ typedef std::tr1::has_trivial_assign<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;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc 2004-12-31 00:02:52.000000000 +0100
@@ -0,0 +1,59 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 4.5.3 Type properties
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using std::tr1::has_trivial_copy;
+ using namespace __gnu_test;
+
+ VERIFY( (test_copy_property<has_trivial_copy, void>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, float>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, EnumType>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int*>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int(*)(int)>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_copy_property<has_trivial_copy,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int[2]>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, float[][3]>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int*[3]>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy, int(*[][2])(int)>(true)) );
+ VERIFY( (test_copy_property<has_trivial_copy,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_copy_property<has_trivial_copy,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc
--- libstdc++-v3-orig/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc 2004-12-30 23:31:38.000000000 +0100
@@ -0,0 +1,36 @@
+// 2004-12-30 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+//
+// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
+
+#include <tr1/type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+ // Check for required typedefs
+ typedef std::tr1::has_trivial_copy<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;
+}