decl.c (make_typename_type): Only error out if tf_error is set in complain.

2012-09-14  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (make_typename_type): Only error out if tf_error is set
	in complain.

From-SVN: r191303

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 21256df040356dbd1241f9f2ea0297025806ca58..630c74a343ae0a3f186596e71800181377ff3a57 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * decl.c (make_typename_type): Only error out if tf_error is set
+       in complain.
+
 2012-09-13  Paolo Carlini  <paolo.carlini@oracle.com>
            Manuel López-Ibáñez  <manu@gcc.gnu.org>
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 06e9ae7d33752d3cb3dfb672428d22b1e768ab45..6b5b986fee7855024945dc0de64d50ca24b040b3 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3235,13 +3235,15 @@ make_typename_type (tree context, tree name, enum tag_types tag_type,
        name = TREE_OPERAND (fullname, 0) = DECL_NAME (name);
       else if (TREE_CODE (name) == OVERLOAD)
        {
-         error ("%qD is not a type", name);
+         if (complain & tf_error)
+           error ("%qD is not a type", name);
          return error_mark_node;
        }
     }
   if (TREE_CODE (name) == TEMPLATE_DECL)
     {
-      error ("%qD used without template parameters", name);
+      if (complain & tf_error)
+       error ("%qD used without template parameters", name);
       return error_mark_node;
     }
   gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);