aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2018-09-07 09:12:24 -0400
committerJason Merrill <jason@gcc.gnu.org>2018-09-07 09:12:24 -0400
commit6bf9284fbfe4f37cdb02c502b211dd28317710a6 (patch)
treef00cd5be4ec43dc83e690c4547ced86473ae3f89
parent446a665106f11d64b862ebf742de498682d59e29 (diff)
downloadgcc-6bf9284fbfe4f37cdb02c502b211dd28317710a6.zip
gcc-6bf9284fbfe4f37cdb02c502b211dd28317710a6.tar.gz
gcc-6bf9284fbfe4f37cdb02c502b211dd28317710a6.tar.bz2
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
-rw-r--r--gcc/testsuite/g++.dg/template/ptrmem20.C2
-rw-r--r--gcc/testsuite/g++.dg/template/ptrmem8.C4
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 e17ed84..74713a7 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 b759b70..4e9fab0 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 }
}