From 80f7a782fd5a8030805a56db68c85db3bd139e23 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 22 Apr 2013 16:35:58 -0400
Subject: re PR c++/48665 (type of const member function)

	PR c++/48665
	* rtti.c (get_typeid): Diagnose qualified function type.
	* pt.c (tsubst) [POINTER_TYPE]: Likewise.

From-SVN: r198160
---
 libstdc++-v3/ChangeLog                             |  8 ++++
 .../testsuite/20_util/is_assignable/value.cc       | 10 ++---
 .../testsuite/20_util/is_constructible/value-2.cc  | 50 +++++++++++-----------
 .../20_util/reference_wrapper/result_type.cc       |  6 +--
 .../20_util/reference_wrapper/typedefs-2.cc        | 30 ++++++-------
 5 files changed, 56 insertions(+), 48 deletions(-)

(limited to 'libstdc++-v3')

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a320fa7..b44f584 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-22  Jason Merrill  <jason@redhat.com>
+
+	* testsuite/20_util/is_assignable/value.cc: Comment out tests involving
+	function-cv-quals.
+	* testsuite/20_util/is_constructible/value-2.cc: Likewise.
+	* testsuite/20_util/reference_wrapper/result_type.cc: Likewise.
+	* testsuite/20_util/reference_wrapper/typedefs-2.cc: Likewise.
+
 2013-04-22  François Dumont  <fdumont@gcc.gnu.org>
 
 	* include/bits/hashtable_policy.h: Add C++11 allocator support.
diff --git a/libstdc++-v3/testsuite/20_util/is_assignable/value.cc b/libstdc++-v3/testsuite/20_util/is_assignable/value.cc
index eade406..8d45671 100644
--- a/libstdc++-v3/testsuite/20_util/is_assignable/value.cc
+++ b/libstdc++-v3/testsuite/20_util/is_assignable/value.cc
@@ -277,8 +277,8 @@ static_assert(!std::is_assignable<DelAnyAssign&, int&>::value, "Error");
 static_assert(!std::is_assignable<DelAnyAssign&, const int&>::value, "Error");
 static_assert(!std::is_assignable<DelAnyAssign&, void>::value, "Error");
 static_assert(!std::is_assignable<DelAnyAssign&, void()>::value, "Error");
-static_assert(!std::is_assignable<DelAnyAssign&, void()
-const>::value, "Error");
+// static_assert(!std::is_assignable<DelAnyAssign&, void()
+// const>::value, "Error");
 static_assert(!std::is_assignable<DelAnyAssign&, void(&)()>::value, "Error");
 static_assert(!std::is_assignable<DelAnyAssign&, void(&&)()>::value, "Error");
 static_assert(!std::is_assignable<DelAnyAssign&,
@@ -600,7 +600,7 @@ static_assert(std::is_assignable<UAssignAll&,
 std::nullptr_t&>::value, "Error");
 static_assert(std::is_assignable<UAssignAll&, void()>::value, "Error");
 static_assert(std::is_assignable<UAssignAll&, void(&)()>::value, "Error");
-static_assert(std::is_assignable<UAssignAll&, void() const>::value, "Error");
+//static_assert(std::is_assignable<UAssignAll&, void() const>::value, "Error");
 static_assert(std::is_assignable<UAssignAll&, void(*)()>::value, "Error");
 static_assert(std::is_assignable<UAssignAll&, void(*&)()>::value, "Error");
 static_assert(std::is_assignable<UAssignAll&, int*>::value, "Error");
@@ -636,8 +636,8 @@ static_assert(!std::is_assignable<UDelAssignAll&,
 std::nullptr_t&>::value, "Error");
 static_assert(!std::is_assignable<UDelAssignAll&, void()>::value, "Error");
 static_assert(!std::is_assignable<UDelAssignAll&, void(&)()>::value, "Error");
-static_assert(!std::is_assignable<UDelAssignAll&, void()
-const>::value, "Error");
+// static_assert(!std::is_assignable<UDelAssignAll&, void()
+// const>::value, "Error");
 static_assert(!std::is_assignable<UDelAssignAll&, void(*)()>::value, "Error");
 static_assert(!std::is_assignable<UDelAssignAll&, void(*&)()>::value, "Error");
 static_assert(!std::is_assignable<UDelAssignAll&, int*>::value, "Error");
diff --git a/libstdc++-v3/testsuite/20_util/is_constructible/value-2.cc b/libstdc++-v3/testsuite/20_util/is_constructible/value-2.cc
index ba6ffab..f311911 100644
--- a/libstdc++-v3/testsuite/20_util/is_constructible/value-2.cc
+++ b/libstdc++-v3/testsuite/20_util/is_constructible/value-2.cc
@@ -72,8 +72,8 @@ static_assert(!std::is_constructible<DelEllipsis, SE>::value, "Error");
 static_assert(!std::is_constructible<DelEllipsis, OpE>::value, "Error");
 static_assert(!std::is_constructible<DelEllipsis, OpSE>::value, "Error");
 static_assert(!std::is_constructible<DelEllipsis, void()>::value, "Error");
-static_assert(!std::is_constructible<DelEllipsis, void() const>::value,
-	      "Error");
+// static_assert(!std::is_constructible<DelEllipsis, void() const>::value,
+// 	      "Error");
 static_assert(!std::is_constructible<DelEllipsis, int[1]>::value, "Error");
 static_assert(!std::is_constructible<DelEllipsis, int[]>::value, "Error");
 static_assert(!std::is_constructible<DelEllipsis, int*>::value, "Error");
@@ -461,20 +461,20 @@ static_assert(!std::is_constructible<OpSE, void()>::value, "Error");
 static_assert(!std::is_constructible<int[], void()>::value, "Error");
 static_assert(!std::is_constructible<int[1], void()>::value, "Error");
 
-static_assert(!std::is_constructible<void(int) const,
-	      void() const>::value, "Error");
-static_assert(!std::is_constructible<int, void() const>::value, "Error");
-static_assert(!std::is_constructible<Abstract, void() const>::value, "Error");
-static_assert(!std::is_constructible<std::nullptr_t, void() const>::value,
-	      "Error");
-static_assert(!std::is_constructible<Empty, void() const>::value, "Error");
-static_assert(!std::is_constructible<U, void() const>::value, "Error");
-static_assert(!std::is_constructible<E, void() const>::value, "Error");
-static_assert(!std::is_constructible<SE, void() const>::value, "Error");
-static_assert(!std::is_constructible<OpE, void() const>::value, "Error");
-static_assert(!std::is_constructible<OpSE, void() const>::value, "Error");
-static_assert(!std::is_constructible<int[], void() const>::value, "Error");
-static_assert(!std::is_constructible<int[1], void() const>::value, "Error");
+// static_assert(!std::is_constructible<void(int) const,
+// 	      void() const>::value, "Error");
+// static_assert(!std::is_constructible<int, void() const>::value, "Error");
+// static_assert(!std::is_constructible<Abstract, void() const>::value, "Error");
+// static_assert(!std::is_constructible<std::nullptr_t, void() const>::value,
+// 	      "Error");
+// static_assert(!std::is_constructible<Empty, void() const>::value, "Error");
+// static_assert(!std::is_constructible<U, void() const>::value, "Error");
+// static_assert(!std::is_constructible<E, void() const>::value, "Error");
+// static_assert(!std::is_constructible<SE, void() const>::value, "Error");
+// static_assert(!std::is_constructible<OpE, void() const>::value, "Error");
+// static_assert(!std::is_constructible<OpSE, void() const>::value, "Error");
+// static_assert(!std::is_constructible<int[], void() const>::value, "Error");
+// static_assert(!std::is_constructible<int[1], void() const>::value, "Error");
 
 static_assert(!std::is_constructible<void, int, int>::value, "Error");
 static_assert(!std::is_constructible<void, Empty, B>::value, "Error");
@@ -488,8 +488,8 @@ static_assert(!std::is_constructible<void, int[], int[]>::value, "Error");
 static_assert(!std::is_constructible<void, void, int>::value, "Error");
 static_assert(!std::is_constructible<void, void, void>::value, "Error");
 static_assert(!std::is_constructible<void, void(), void()>::value, "Error");
-static_assert(!std::is_constructible<void, void() const,
-	      void() volatile>::value, "Error");
+// static_assert(!std::is_constructible<void, void() const,
+// 	      void() volatile>::value, "Error");
 
 static_assert(!std::is_constructible<int, int, int>::value, "Error");
 static_assert(!std::is_constructible<const int, int, int>::value, "Error");
@@ -651,13 +651,13 @@ static_assert(!std::is_constructible<void(), void, void>::value, "Error");
 static_assert(!std::is_constructible<void(), void(), int>::value, "Error");
 static_assert(!std::is_constructible<void(), void(), void()>::value, "Error");
 
-static_assert(!std::is_constructible<void() const, int, int>::value, "Error");
-static_assert(!std::is_constructible<void() const, void, int>::value, "Error");
-static_assert(!std::is_constructible<void() const, void, void>::value, "Error");
-static_assert(!std::is_constructible<void() const, void() volatile,
-	      int>::value, "Error");
-static_assert(!std::is_constructible<void() const, void() volatile const,
-	      void() const>::value, "Error");
+// static_assert(!std::is_constructible<void() const, int, int>::value, "Error");
+// static_assert(!std::is_constructible<void() const, void, int>::value, "Error");
+// static_assert(!std::is_constructible<void() const, void, void>::value, "Error");
+// static_assert(!std::is_constructible<void() const, void() volatile,
+// 	      int>::value, "Error");
+// static_assert(!std::is_constructible<void() const, void() volatile const,
+// 	      void() const>::value, "Error");
 
 static_assert(!std::is_constructible<FromArgs<int>, int, int>::value, "Error");
 static_assert(!std::is_constructible<const FromArgs<int>, int, int>::value,
diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/result_type.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/result_type.cc
index 24cd6b9..e849a5d 100644
--- a/libstdc++-v3/testsuite/20_util/reference_wrapper/result_type.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/result_type.cc
@@ -27,9 +27,9 @@ using namespace std;
 struct T;
 
 reference_wrapper<int(float, ...)>::result_type                       i01;
-reference_wrapper<int(float, ...) const>::result_type                 i02;
-reference_wrapper<int(float, ...) volatile>::result_type              i03;
-reference_wrapper<int(float, ...) const volatile>::result_type        i04;
+// reference_wrapper<int(float, ...) const>::result_type                 i02;
+// reference_wrapper<int(float, ...) volatile>::result_type              i03;
+// reference_wrapper<int(float, ...) const volatile>::result_type        i04;
 
 reference_wrapper<int(*)(float, ...)>::result_type                    i05;
 reference_wrapper<int(* const)(float, ...)>::result_type              i06;
diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/typedefs-2.cc
index 89dcd3b..e0f7231 100644
--- a/libstdc++-v3/testsuite/20_util/reference_wrapper/typedefs-2.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/typedefs-2.cc
@@ -25,13 +25,13 @@
 using namespace std;
 
 reference_wrapper<int(float)>::argument_type                               i01;
-reference_wrapper<int(float) const>::argument_type                         i02;
-reference_wrapper<int(float) volatile>::argument_type                      i03;
-reference_wrapper<int(float) const volatile>::argument_type                i04;
+// reference_wrapper<int(float) const>::argument_type                         i02;
+// reference_wrapper<int(float) volatile>::argument_type                      i03;
+// reference_wrapper<int(float) const volatile>::argument_type                i04;
 reference_wrapper<int(float)>::result_type                                 i05;
-reference_wrapper<int(float) const>::result_type                           i06;
-reference_wrapper<int(float) volatile>::result_type                        i07;
-reference_wrapper<int(float) const volatile>::result_type                  i08;
+// reference_wrapper<int(float) const>::result_type                           i06;
+// reference_wrapper<int(float) volatile>::result_type                        i07;
+// reference_wrapper<int(float) const volatile>::result_type                  i08;
 
 reference_wrapper<int(*)(float)>::argument_type                            i09;
 reference_wrapper<int(* const)(float)>::argument_type                      i10;
@@ -43,17 +43,17 @@ reference_wrapper<int(* volatile)(float)>::result_type                     i15;
 reference_wrapper<int(* const volatile)(float)>::result_type               i16;
 
 reference_wrapper<int(float, char)>::first_argument_type                   i17;
-reference_wrapper<int(float, char) const>::first_argument_type             i18;
-reference_wrapper<int(float, char) volatile>::first_argument_type          i19;
-reference_wrapper<int(float, char) const volatile>::first_argument_type    i20;
+// reference_wrapper<int(float, char) const>::first_argument_type             i18;
+// reference_wrapper<int(float, char) volatile>::first_argument_type          i19;
+// reference_wrapper<int(float, char) const volatile>::first_argument_type    i20;
 reference_wrapper<int(float, char)>::second_argument_type                  i21;
-reference_wrapper<int(float, char) const>::second_argument_type            i22;
-reference_wrapper<int(float, char) volatile>::second_argument_type         i23;
-reference_wrapper<int(float, char) const volatile>::second_argument_type   i24;
+// reference_wrapper<int(float, char) const>::second_argument_type            i22;
+// reference_wrapper<int(float, char) volatile>::second_argument_type         i23;
+// reference_wrapper<int(float, char) const volatile>::second_argument_type   i24;
 reference_wrapper<int(float, char)>::result_type                           i25;
-reference_wrapper<int(float, char) const>::result_type                     i26;
-reference_wrapper<int(float, char) volatile>::result_type                  i27;
-reference_wrapper<int(float, char) const volatile>::result_type            i28;
+// reference_wrapper<int(float, char) const>::result_type                     i26;
+// reference_wrapper<int(float, char) volatile>::result_type                  i27;
+// reference_wrapper<int(float, char) const volatile>::result_type            i28;
 
 reference_wrapper<int(*)(float, char)>::first_argument_type                i29;
 reference_wrapper<int(* const)(float, char)>::first_argument_type          i30;
-- 
cgit v1.1