From 6bf9284fbfe4f37cdb02c502b211dd28317710a6 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 7 Sep 2018 09:12:24 -0400 Subject: [PATCH] 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 --- gcc/testsuite/g++.dg/template/ptrmem20.C | 2 +- gcc/testsuite/g++.dg/template/ptrmem8.C | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 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 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 } } -- 2.30.2