re PR c++/10903 ([3.3 only] g++ says: "error: object ``type_decl' not supported by...

        PR c++/10903
        * pt.c (convert_nontype_argument): Fix thinko in diagnostic.
        Improve.

From-SVN: r69435

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b491c2b720b3683a877c438e8fa5f7f8c9757283..4c750887af275f7304ef08b90d50ea2a6013adde 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-16  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       PR c++/10903
+       * pt.c (convert_nontype_argument): Fix thinko in diagnostic.
+       Improve.
+
 2003-07-15  Mark Mitchell  <mark@codesourcery.com>
 
        * cp-tree.def (LOOKUP_EXPR): Remove.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8712ce6efb74afd0e96af785c15c913ead45609e..1a8ea15c04092225c78be50cca5e76745dfce861 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3085,7 +3085,14 @@ convert_nontype_argument (tree type, tree expr)
     }
   else 
     {
-      error ("object `%E' cannot be used as template argument", expr);
+      if (TYPE_P (expr))
+        error ("type '%T' cannot be used as a value for a non-type "
+               "template-parameter", expr);
+      else if (DECL_P (expr))
+        error ("invalid use of '%D' as a non-type template-argument", expr);
+      else
+        error ("invalid use of '%E' as a non-type template-argument", expr);
+
       return NULL_TREE;
     }
 

diff --git a/gcc/testsuite/g++.dg/template/non-type-template-argument-1.C b/gcc/testsuite/g++.dg/template/non-type-template-argument-1.C
new file mode 100644 (file)
index 0000000..fbe5f3f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/non-type-template-argument-1.C
@@ -0,0 +1,12 @@
+struct A { static const bool b=false; };
+
+struct B { typedef A X; };
+
+template <bool> struct C {};
+
+template <typename T> struct D
+{
+   C<T::X> c;                   // { dg-error "invalid use" }
+};
+
+D<B> d;                         // { dg-error "" }