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 e17ed84c739fa103b657c9aece3b562f58def084..74713a72192be8c0780ce821c4dd143e0d15fb3d 100644 (file)
--- 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 b759b7077d53a61170c781182d07409f7a7b59e2..4e9fab046925e1b58b5e721e19556688acc6ac03 100644 (file)
--- 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 }
 }