diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/diagnostic/pr71075.C | 8 |
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5c38aaf..dcd660f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2016-05-19 Marek Polacek <polacek@redhat.com> + + PR c++/71075 + * pt.c (unify_template_argument_mismatch): Use %qE instead of %qD. + 2016-05-19 Jason Merrill <jason@redhat.com> PR c++/10200 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3908592..2bba571 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6165,7 +6165,7 @@ unify_template_argument_mismatch (bool explain_p, tree parm, tree arg) { if (explain_p) inform (input_location, - " template argument %qE does not match %qD", arg, parm); + " template argument %qE does not match %qE", arg, parm); return 1; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1630598..4166872 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-05-19 Marek Polacek <polacek@redhat.com> + + PR c++/71075 + * g++.dg/diagnostic/pr71075.C: New test. + 2016-05-19 David Malcolm <dmalcolm@redhat.com> PR c++/71184 diff --git a/gcc/testsuite/g++.dg/diagnostic/pr71075.C b/gcc/testsuite/g++.dg/diagnostic/pr71075.C new file mode 100644 index 0000000..6bb1e68 --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/pr71075.C @@ -0,0 +1,8 @@ +// PR c++/71075 + +template<typename T, int I> struct A {}; +template<typename T> void foo(A<T,1>) {} +int main() { + foo(A<int,2>()); // { dg-error "no matching" } +// { dg-message "template argument .2. does not match .1." "" { target *-*-* } 6 } +} |