cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.

[gcc.git] / gcc / cp / semantics.c

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 632e91320381c3675b9c9fc355aac012f6942417..e2081b57a14f06ca2b57edfbaaca648ecb012b04 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -878,7 +878,7 @@ finish_asm_stmt (cv_qualifier, string, output_operands,
   if (cv_qualifier != NULL_TREE
       && cv_qualifier != ridpointers[(int) RID_VOLATILE])
     {
-      cp_warning ("%s qualifier ignored on asm",
+      warning ("%s qualifier ignored on asm",
                  IDENTIFIER_POINTER (cv_qualifier));
       cv_qualifier = NULL_TREE;
     }
@@ -900,7 +900,7 @@ finish_asm_stmt (cv_qualifier, string, output_operands,
             resolve the overloading.  */
          if (TREE_TYPE (converted_operand) == unknown_type_node)
            {
-             cp_error ("type of asm operand `%E' could not be determined", 
+             error ("type of asm operand `%E' could not be determined", 
                        TREE_VALUE (t));
              converted_operand = error_mark_node;
            }
@@ -1051,7 +1051,7 @@ finish_named_return_value (return_id, init)
        DECL_NAME (decl) = return_id;
       else
        {
-         cp_error ("return identifier `%D' already in place", return_id);
+         error ("return identifier `%D' already in place", return_id);
          return;
        }
     }
@@ -1126,7 +1126,7 @@ finish_mem_initializers (init_list)
                   base != last_base_warned_about; 
                   base = TREE_CHAIN (base))
                {
-                 cp_warning ("base initializer for `%T'",
+                 warning ("base initializer for `%T'",
                              TREE_PURPOSE (base));
                  warning ("   will be re-ordered to precede member initializations");
                }
@@ -1444,7 +1444,7 @@ finish_object_call_expr (fn, object, args)
        fn = DECL_NAME (fn);
       else
        {
-         cp_error ("calling type `%T' like a method", fn);
+         error ("calling type `%T' like a method", fn);
          return error_mark_node;
        }
     }
@@ -1480,13 +1480,13 @@ finish_pseudo_destructor_call_expr (object, scope, destructor)
     return build_min_nt (PSEUDO_DTOR_EXPR, object, scope, destructor);
 
   if (scope && scope != destructor)
-    cp_error ("destructor specifier `%T::~%T()' must have matching names", 
+    error ("destructor specifier `%T::~%T()' must have matching names", 
              scope, destructor);
 
   if ((scope == NULL_TREE || IDENTIFIER_GLOBAL_VALUE (destructor))
       && (TREE_CODE (TREE_TYPE (object)) !=
          TREE_CODE (TREE_TYPE (IDENTIFIER_GLOBAL_VALUE (destructor)))))
-    cp_error ("`%E' is not of type `%T'", object, destructor);
+    error ("`%E' is not of type `%T'", object, destructor);
 
   return cp_convert (void_type_node, object);
 }
@@ -1757,7 +1757,7 @@ begin_class_definition (t)
   
   if (processing_template_parmlist)
     {
-      cp_error ("definition of `%#T' inside template parameter list", t);
+      error ("definition of `%#T' inside template parameter list", t);
       return error_mark_node;
     }
 
@@ -1773,7 +1773,7 @@ begin_class_definition (t)
      This is erroneous.  */
   else if (TREE_CODE (t) == TYPENAME_TYPE)
     {
-      cp_error ("invalid definition of qualified type `%T'", t);
+      error ("invalid definition of qualified type `%T'", t);
       t = error_mark_node;
     }
 
@@ -2125,7 +2125,7 @@ finish_base_specifier (access_specifier, base_class)
     {
       if (cp_type_quals (base_class) != 0)
         {
-          cp_error ("base class `%T' has cv qualifiers", base_class);
+          error ("base class `%T' has cv qualifiers", base_class);
           base_class = TYPE_MAIN_VARIANT (base_class);
         }
       result = build_tree_list (access_specifier, base_class);
@@ -2158,7 +2158,7 @@ check_multiple_declarators ()
   if (PROCESSING_REAL_TEMPLATE_DECL_P () 
       || processing_explicit_instantiation
       || processing_specialization)
-    cp_error ("multiple declarators in template declaration");
+    error ("multiple declarators in template declaration");
 }
 
 /* Implement the __typeof keyword: Return the type of EXPR, suitable for