2004-12-31 Paolo Carlini <pcarlini@suse.de>

	* include/tr1/type_traits (is_member_function_pointer): Provide a
	workaround for c++/19076, correct for functions with up to 15
	arguments.
	* testsuite/tr1/4_metaprogramming/composite_type_traits/
	is_member_pointer/is_member_pointer.cc: Uncomment "XFAILed" tests;
	add a test for variadic functions.
	* testsuite/tr1/4_metaprogramming/composite_type_traits/
	is_scalar/is_scalar.cc: Uncomment "XFAILed" tests.
	* testsuite/tr1/4_metaprogramming/primary_type_categories/
	is_enum/is_enum.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/primary_type_categories/
	is_member_function_pointer/is_member_function_pointer.cc: Likewise;
	add a test for variadic functions.
	* testsuite/tr1/4_metaprogramming/primary_type_categories/
	is_member_object_pointer/is_member_object_pointer.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_nothrow_assign/has_nothrow_assign.cc: Uncomment "XFAILed" tests.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_nothrow_constructor/has_nothrow_constructor.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_nothrow_copy/has_nothrow_copy.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_trivial_assign/has_trivial_assign.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_trivial_constructor/has_trivial_constructor.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_trivial_copy/has_trivial_copy.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	has_trivial_destructor/has_trivial_destructor.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/type_properties/
	is_pod/is_pod.cc: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92769 138bc75d-0d04-0410-961f-82ee72b054a4

13 files changed, 54 insertions, 71 deletions

diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_member_pointer/is_member_pointer.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_member_pointer/is_member_pointer.cc
index 918417e4ed2..f7ae576e234 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_member_pointer/is_member_pointer.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_member_pointer/is_member_pointer.cc
@@ -34,16 +34,16 @@ void test01()
   VERIFY( (test_category<is_member_pointer, const int (ClassType::*)>(true)) );
   VERIFY( (test_category<is_member_pointer, ClassType (ClassType::*)>(true)) );
 
-  // Temporarily disabled because of c++/19076 :-(
-
-  //VERIFY( (test_category<is_member_pointer,
-  //   int (ClassType::*) (int)>(true)) );
-  //VERIFY( (test_category<is_member_pointer,
-  //   int (ClassType::*) (int) const>(true)) );
-  //VERIFY( (test_category<is_member_function_pointer,
-  //   ClassType (ClassType::*) (ClassType)>(true)) );
-  //VERIFY( (test_category<is_member_pointer,
-  //   float (ClassType::*) (int, float, int[], int&)>(true)) );
+  VERIFY( (test_category<is_member_pointer,
+	   int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<is_member_pointer,
+	   int (ClassType::*) (int) const>(true)) );
+  VERIFY( (test_category<is_member_pointer,
+	   int (ClassType::*) (float, ...)>(true)) );
+  VERIFY( (test_category<is_member_pointer,
+	   ClassType (ClassType::*) (ClassType)>(true)) );
+  VERIFY( (test_category<is_member_pointer,
+	   float (ClassType::*) (int, float, int[], int&)>(true)) );
   
   // Sanity check.
   VERIFY( (test_category<is_member_pointer, ClassType>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_scalar/is_scalar.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_scalar/is_scalar.cc
index 37d6592f04f..7fc1faf413c 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_scalar/is_scalar.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_scalar/is_scalar.cc
@@ -36,8 +36,7 @@ void test01()
   VERIFY( (test_category<is_scalar, int*>(true)) );
   VERIFY( (test_category<is_scalar, int(*)(int)>(true)) );
   VERIFY( (test_category<is_scalar, int (ClassType::*)>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<is_scalar, int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<is_scalar, int (ClassType::*) (int)>(true)) );
 
   // Sanity check.
   VERIFY( (test_category<is_scalar, ClassType>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_enum/is_enum.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_enum/is_enum.cc
index 3de48c4084f..0ae5887fcf6 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_enum/is_enum.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_enum/is_enum.cc
@@ -43,8 +43,7 @@ void test01()
   VERIFY( (test_category<is_enum, float&>(false)) );
   VERIFY( (test_category<is_enum, float(&)(float)>(false)) );
   VERIFY( (test_category<is_enum, int (ClassType::*)>(false)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<is_enum, int (ClassType::*) (int)>(false)) );
+  VERIFY( (test_category<is_enum, int (ClassType::*) (int)>(false)) );
   VERIFY( (test_category<is_enum, int (int)>(false)) );
 
   VERIFY( (test_category<is_enum, ConvType>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_function_pointer/is_member_function_pointer.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_function_pointer/is_member_function_pointer.cc
index 9652e1943e7..54b2711ae1b 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_function_pointer/is_member_function_pointer.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_function_pointer/is_member_function_pointer.cc
@@ -31,17 +31,16 @@ void test01()
   using namespace __gnu_test;
 
   // Positive tests.
-
-  // Temporarily disabled because of c++/19076 :-(
-
-  //VERIFY( (test_category<is_member_function_pointer,
-  //   int (ClassType::*) (int)>(true)) );
-  //VERIFY( (test_category<is_member_function_pointer,
-  //   int (ClassType::*) (int) const>(true)) );
-  //VERIFY( (test_category<is_member_function_pointer,
-  //   ClassType (ClassType::*) (ClassType)>(true)) );
-  //VERIFY( (test_category<is_member_function_pointer,
-  //   float (ClassType::*) (int, float, int[], int&)>(true)) );
+  VERIFY( (test_category<is_member_function_pointer,
+	   int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<is_member_function_pointer,
+	   int (ClassType::*) (int) const>(true)) );
+  VERIFY( (test_category<is_member_function_pointer,
+	   int (ClassType::*) (float, ...)>(true)) );
+  VERIFY( (test_category<is_member_function_pointer,
+	   ClassType (ClassType::*) (ClassType)>(true)) );
+  VERIFY( (test_category<is_member_function_pointer,
+	   float (ClassType::*) (int, float, int[], int&)>(true)) );
 
   // Negative tests.
   VERIFY( (test_category<is_member_function_pointer,
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_object_pointer/is_member_object_pointer.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_object_pointer/is_member_object_pointer.cc
index 986eee1173c..4f1045e6803 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_object_pointer/is_member_object_pointer.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/primary_type_categories/is_member_object_pointer/is_member_object_pointer.cc
@@ -44,6 +44,8 @@ void test01()
   VERIFY( (test_category<is_member_object_pointer,
 	   int (ClassType::*) (int) const>(false)) );
   VERIFY( (test_category<is_member_object_pointer,
+	   int (ClassType::*) (float, ...)>(false)) );
+  VERIFY( (test_category<is_member_object_pointer,
 	   ClassType (ClassType::*) (ClassType)>(false)) );
   VERIFY( (test_category<is_member_object_pointer,
 	   float (ClassType::*) (int, float, int[], int&)>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc
index 76dbbb8948e..e07fa4f589f 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc
@@ -37,9 +37,8 @@ void test01()
   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 (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)) );
@@ -47,9 +46,8 @@ void test01()
   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)) );
+  VERIFY( (test_assign_property<has_nothrow_assign,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc
index 3db624154bb..18c3a33fb2f 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc
@@ -37,9 +37,8 @@ void test01()
   VERIFY( (test_category<has_nothrow_constructor, int*>(true)) );
   VERIFY( (test_category<has_nothrow_constructor, int(*)(int)>(true)) );
   VERIFY( (test_category<has_nothrow_constructor, int (ClassType::*)>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<has_nothrow_constructor,
-  //   int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<has_nothrow_constructor,
+	   int (ClassType::*) (int)>(true)) );
   VERIFY( (test_category<has_nothrow_constructor, int[2]>(true)) );
   VERIFY( (test_category<has_nothrow_constructor, float[][3]>(true)) );
   VERIFY( (test_category<has_nothrow_constructor, EnumType[2][3][4]>(true)) );
@@ -47,9 +46,8 @@ void test01()
   VERIFY( (test_category<has_nothrow_constructor, int(*[][2])(int)>(true)) );
   VERIFY( (test_category<has_nothrow_constructor,
 	   int (ClassType::*[2][3])>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<has_nothrow_constructor,
-  //   int (ClassType::*[][2][3]) (int)>(true)) );
+  VERIFY( (test_category<has_nothrow_constructor,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 
   // Sanity check.
   VERIFY( (test_category<has_nothrow_constructor, ClassType>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc
index a59646565cc..7ba63bfa954 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc
@@ -37,9 +37,8 @@ void test01()
   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 (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)) );
@@ -47,9 +46,8 @@ void test01()
   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)) );
+  VERIFY( (test_copy_property<has_nothrow_copy,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc
index a85bcad3c99..66b2bc18c38 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc
@@ -37,9 +37,8 @@ void test01()
   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 (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)) );
@@ -47,9 +46,8 @@ void test01()
   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)) );
+  VERIFY( (test_assign_property<has_trivial_assign,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/has_trivial_constructor.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/has_trivial_constructor.cc
index 1de7d1eb969..7559a43ffc1 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/has_trivial_constructor.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/has_trivial_constructor.cc
@@ -37,9 +37,8 @@ void test01()
   VERIFY( (test_category<has_trivial_constructor, int*>(true)) );
   VERIFY( (test_category<has_trivial_constructor, int(*)(int)>(true)) );
   VERIFY( (test_category<has_trivial_constructor, int (ClassType::*)>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<has_trivial_constructor,
-  //   int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<has_trivial_constructor,
+	   int (ClassType::*) (int)>(true)) );
   VERIFY( (test_category<has_trivial_constructor, int[2]>(true)) );
   VERIFY( (test_category<has_trivial_constructor, float[][3]>(true)) );
   VERIFY( (test_category<has_trivial_constructor, EnumType[2][3][4]>(true)) );
@@ -47,9 +46,8 @@ void test01()
   VERIFY( (test_category<has_trivial_constructor, int(*[][2])(int)>(true)) );
   VERIFY( (test_category<has_trivial_constructor,
 	   int (ClassType::*[2][3])>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<has_trivial_constructor,
-  //   int (ClassType::*[][2][3]) (int)>(true)) );
+  VERIFY( (test_category<has_trivial_constructor,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 
   // Sanity check.
   VERIFY( (test_category<has_trivial_constructor, ClassType>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc
index 6002b85bb6a..64eed997d60 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc
@@ -37,9 +37,8 @@ void test01()
   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 (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)) );
@@ -47,9 +46,8 @@ void test01()
   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)) );
+  VERIFY( (test_copy_property<has_trivial_copy,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc
index 4e4a2842fb1..e3cc9db9f8f 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc
@@ -37,9 +37,8 @@ void test01()
   VERIFY( (test_category<has_trivial_destructor, int*>(true)) );
   VERIFY( (test_category<has_trivial_destructor, int(*)(int)>(true)) );
   VERIFY( (test_category<has_trivial_destructor, int (ClassType::*)>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<has_trivial_destructor,
-  //   int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<has_trivial_destructor,
+	   int (ClassType::*) (int)>(true)) );
   VERIFY( (test_category<has_trivial_destructor, int[2]>(true)) );
   VERIFY( (test_category<has_trivial_destructor, float[][3]>(true)) );
   VERIFY( (test_category<has_trivial_destructor, EnumType[2][3][4]>(true)) );
@@ -47,9 +46,8 @@ void test01()
   VERIFY( (test_category<has_trivial_destructor, int(*[][2])(int)>(true)) );
   VERIFY( (test_category<has_trivial_destructor,
 	   int (ClassType::*[2][3])>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<has_trivial_destructor,
-  //   int (ClassType::*[][2][3]) (int)>(true)) );
+  VERIFY( (test_category<has_trivial_destructor,
+	   int (ClassType::*[][2][3]) (int)>(true)) );
 
   // Sanity check.
   VERIFY( (test_category<has_trivial_destructor, ClassType>(false)) );
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc
index 4fac0f3cb0e..485692091c8 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc
@@ -37,16 +37,14 @@ void test01()
   VERIFY( (test_category<is_pod, int*>(true)) );
   VERIFY( (test_category<is_pod, int(*)(int)>(true)) );
   VERIFY( (test_category<is_pod, int (ClassType::*)>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<is_pod, int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_category<is_pod, int (ClassType::*) (int)>(true)) );
   VERIFY( (test_category<is_pod, int[2]>(true)) );
   VERIFY( (test_category<is_pod, float[][3]>(true)) );
   VERIFY( (test_category<is_pod, EnumType[2][3][4]>(true)) );
   VERIFY( (test_category<is_pod, int*[3]>(true)) );
   VERIFY( (test_category<is_pod, int(*[][2])(int)>(true)) );
   VERIFY( (test_category<is_pod, int (ClassType::*[2][3])>(true)) );
-  // Temporarily disabled because of c++/19076 :-(
-  // VERIFY( (test_category<is_pod, int (ClassType::*[][2][3]) (int)>(true)) );
+  VERIFY( (test_category<is_pod, int (ClassType::*[][2][3]) (int)>(true)) );
 
   // Sanity check.
   VERIFY( (test_category<is_pod, ClassType>(false)) );