diff options
Diffstat (limited to 'gcc')
| -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/template/ttp5.C | 20 |
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eb5b26e..c68ca29 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2003-05-01 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8772 + * pt.c (convert_template_argument): Correct diagnostic. + 2003-04-30 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> PR c++/9432, c++/9528 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 52df60b..73ada26 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3579,6 +3579,8 @@ convert_template_argument (parm, arg, args, complain, i, in_decl) error (" expected a constant of type `%T', got `%T'", TREE_TYPE (parm), (is_tmpl_type ? DECL_NAME (arg) : arg)); + else if (requires_tmpl_type) + error (" expected a class template, got `%E'", arg); else error (" expected a type, got `%E'", arg); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2387d53..6dcbe62 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-05-01 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8772 + * g++.dg/template/ttp5.C: New test. + 2003-04-30 Mark Mitchell <mark@codesourcery.com> * lib/g++-dg.exp (g++-dg-test): Add "repo" option. diff --git a/gcc/testsuite/g++.dg/template/ttp5.C b/gcc/testsuite/g++.dg/template/ttp5.C new file mode 100644 index 0000000..d26b816 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ttp5.C @@ -0,0 +1,20 @@ +// { dg-do compile } + +// Origin: sneechy@hotmail.com + +// PR c++/8772: Incorrect diagnostics for template template parameter +// mismatch + +template <int> struct A { + template <int> struct B { + enum { v = 1 }; + }; +}; + +template <template <int> class F> struct C { + enum { v = F<1>::v || 2 }; +}; + +template <int n> struct D { + enum { v = C<A<n>::B>::v }; // { dg-error "mismatch|class template|not a member" } +}; |