* invoke.texi (-fno-gnu-keywords): Remove classof, headof,

	__classof__, and __headof__ from the list of gnu keywords.
	* cp/lex.c (init_parse): Remove traces of classof and headof.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33049 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c18abd6..d96a274 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-10  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
+
+       * invoke.texi (-fno-gnu-keywords): Remove classof, headof,
+       __classof__, and __headof__ from the list of gnu keywords.
+
 2000-04-09  Zack Weinberg  <zack@wolery.cumb.org>
 
        * cpphash.c (timestamp): Delete.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5676065..e47edb1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-10  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
+
+       * lex.c (init_parse): Remove traces of classof and headof.
+
 2000-04-09  Mark Mitchell  <mark@codesourcery.com>
 
        * cp-tree.h (struct lang_decl): Remove main_decl_variant.

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 1c4bb57..a5d1269 100644 (file)
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -894,12 +894,6 @@ init_parse (filename)
     }
 #endif
 
-  if (!flag_rtti || flag_no_gnu_keywords)
-    {
-      UNSET_RESERVED_WORD ("classof");
-      UNSET_RESERVED_WORD ("headof");
-    }
-
   if (flag_no_asm || flag_no_gnu_keywords)
     UNSET_RESERVED_WORD ("typeof");
   if (! flag_operator_names)

diff --git a/gcc/invoke.texi b/gcc/invoke.texi
index 946abcc..bf83879 100644 (file)
--- a/gcc/invoke.texi
+++ b/gcc/invoke.texi
@@ -1101,11 +1101,9 @@ but to allow and give a warning for old-style code that would
 otherwise be invalid, or have different behavior.
 
 @item -fno-gnu-keywords
-Do not recognize @code{classof}, @code{headof}, or @code{typeof} as a
-keyword, so that code can use these words as identifiers.  You can use
-the keywords @code{__classof__}, @code{__headof__}, and
-@code{__typeof__} instead.  @samp{-ansi} implies
-@samp{-fno-gnu-keywords}.
+Do not recognize @code{typeof} as a keyword, so that code can use these
+words as identifiers. You can use the keywords @code{__typeof__}
+instead.  @samp{-ansi} implies @samp{-fno-gnu-keywords}.
 
 @item -fguiding-decls
 Treat a function declaration with the same type as a potential function