From: Jason Merrill <jason@gcc.gnu.org>
Date: Fri, 7 Sep 2018 13:12:24 +0000 (-0400)
Subject: Fix C++17 expected errors for pointer to member function template args.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bf9284fbfe4f37cdb02c502b211dd28317710a6;p=gcc.git

Fix C++17 expected errors for pointer to member function template args.

* g++.dg/template/ptrmem20.C: Adjust expected diagnostic.
* g++.dg/template/ptrmem8.C: Likewise.

From-SVN: r264157
---

diff --git a/gcc/testsuite/g++.dg/template/ptrmem20.C b/gcc/testsuite/g++.dg/template/ptrmem20.C
index e17ed84c739..74713a72192 100644
--- a/gcc/testsuite/g++.dg/template/ptrmem20.C
+++ b/gcc/testsuite/g++.dg/template/ptrmem20.C
@@ -12,5 +12,5 @@ template<void (A::*)()> void bar(); // { dg-message "note" }
 
 void baz()
 {
-  bar<&B::foo>();  // { dg-error "template argument|no match" }
+  bar<&B::foo>();  // { dg-error "template argument|no match|convert" }
 }
diff --git a/gcc/testsuite/g++.dg/template/ptrmem8.C b/gcc/testsuite/g++.dg/template/ptrmem8.C
index b759b7077d5..4e9fab04692 100644
--- a/gcc/testsuite/g++.dg/template/ptrmem8.C
+++ b/gcc/testsuite/g++.dg/template/ptrmem8.C
@@ -15,8 +15,8 @@ template <int (D::*fun)() const> int Get(); // { dg-message "note" }
 
 int main () 
 {
-  Get<&B::I>();   // { dg-error "template argument|converted constant" "not valid" }
+  Get<&B::I>();   // { dg-error "template argument|convert" "not valid" }
   // { dg-error "no match" "no match" { target *-*-* } .-1 }
-  Get<&D::I>();   // { dg-error "template argument|converted constant" "not valid" }
+  Get<&D::I>();   // { dg-error "template argument|convert" "not valid" }
   // { dg-error "no match" "no match" { target *-*-* } .-1 }
 }