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

[gcc.git] / gcc / cp / cp-tree.h

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index d4fc1b6de0b41967bf2c96a433e10e674e68a862..5069648752f7b7d106cead6d4442b9dce8cb3521 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3780,14 +3780,6 @@ extern tree set_guard                           PARAMS ((tree));
 /* in parse.y */
 extern void cp_parse_init                      PARAMS ((void));
 
-/* Obsolete names, formerly found in errfn.c, which no longer exists.
-   These are all variadic functions and therefore cannot be defined
-   as function-like macros.  */
-#define cp_error               error
-#define cp_warning             warning
-#define cp_pedwarn             pedwarn
-#define cp_compiler_error      internal_error
-
 extern void cp_error_at                PARAMS ((const char *msgid, ...));
 extern void cp_warning_at      PARAMS ((const char *msgid, ...));
 extern void cp_pedwarn_at      PARAMS ((const char *msgid, ...));
@@ -3795,8 +3787,8 @@ extern void cp_pedwarn_at PARAMS ((const char *msgid, ...));
 /* XXX Not i18n clean.  */
 #define cp_deprecated(str) \
  do { if (warn_deprecated) \
-      cp_warning("%s is deprecated, please see the documentation for details", \
-                str); \
+        warning("%s is deprecated, please see the documentation for details", \
+               str); \
  } while (0)
 
 /* in error.c */