* extend.texi (-fthis-is-variable): Undocument.

	* flags.h (warn_template_debugging): Remove declaration.
	* gcc.1 (-fall-virtual, -fenum-int-equiv, -fthis-is-variable,
	-Wenum-clash, -Wtemplate-debugging): Undocument.
	* cp/tree.h (HAVE_TEMPLATES): Remove definition.
	* cp/lang-options.h (-fthis-is-variable): Remove documentation.


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

7 files changed, 16 insertions, 87 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23625fed675..cb48e72e1b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-11  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
+
+	* extend.texi (-fthis-is-variable): Undocument.
+	* flags.h (warn_template_debugging): Remove declaration.
+	* gcc.1 (-fall-virtual, -fenum-int-equiv, -fthis-is-variable,
+	-Wenum-clash, -Wtemplate-debugging): Undocument.
+
 2000-04-10  Nick Clifton  <nickc@cygnus.com>
 
 	* config/arm/arm.h (HOST_INT): New macro: Declare a HOST_WIDE_INT
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6458ed8f054..7a86ae08218 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-11  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
+
+	* tree.h (HAVE_TEMPLATES): Remove definition.
+	* lang-options.h (-fthis-is-variable): Remove documentation.
+
 2000-04-10  Jason Merrill  <jason@casey.cygnus.com>
 
 	* class.c (instantiate_type): Handle object-relative template-id.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 5ba0e36f963..242da74783b 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -396,10 +396,6 @@ struct tree_srcloc
   int linenum;
 };
 
-/* To identify to the debug emitters if it should pay attention to the
-   flag `-Wtemplate-debugging'.  */
-#define HAVE_TEMPLATES 1
-
 /* Macros for access to language-specific slots in an identifier.  */
 
 #define IDENTIFIER_NAMESPACE_BINDINGS(NODE)	\
diff --git a/gcc/cp/lang-options.h b/gcc/cp/lang-options.h
index 9f3f6fe396c..55db2042496 100644
--- a/gcc/cp/lang-options.h
+++ b/gcc/cp/lang-options.h
@@ -100,7 +100,7 @@ DEFINE_LANG_NAME ("C++")
   { "-fstrict-prototype", "" },
   { "-fno-strict-prototype", "Do not assume that empty prototype means no args" },
   { "-ftemplate-depth-", "Specify maximum template instantiation depth"},
-  { "-fthis-is-variable", "Make 'this' not be type '* const'"  },
+  { "-fthis-is-variable", ""  },
   { "-fno-this-is-variable", "" },
   { "-fuse-cxa-atexit", "Use __cxa_atexit to register destructors." },
   { "-fno-use-cxa-atexit", "" },
diff --git a/gcc/extend.texi b/gcc/extend.texi
index 475241aadde..1569b675979 100644
--- a/gcc/extend.texi
+++ b/gcc/extend.texi
@@ -1,4 +1,4 @@
-@c Copyright (C) 1988,89,92,93,94,96,98, 99 Free Software Foundation, Inc.
+@c Copyright (C) 1988,89,92,93,94,96,98,99,2000 Free Software Foundation, Inc.
 @c This is part of the GCC manual.
 @c For copying conditions, see the file gcc.texi.
 
@@ -3225,13 +3225,6 @@ cases, the feature might be gone already.
 While the list below is not exhaustive, it documents some of the options
 that are now deprecated:
 
-@table @code
-@item -fthis-is-variable
-In early versions of C++, assignment to this could be used to implement
-application-defined memory allocation. Now, allocation functions
-(@samp{operator new}) are the standard-conforming way to achieve the
-same effect.
-
 @item -fexternal-templates
 @itemx -falt-external-templates
 These are two of the many ways for g++ to implement template
diff --git a/gcc/flags.h b/gcc/flags.h
index 81f5bda4c8b..3ed4a31ff46 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -114,11 +114,6 @@ extern int warn_return_type;
 
 extern int warn_cast_align;
 
-/* Nonzero means warn that dbx info for template class methods isn't fully
-   supported yet.  */
-
-extern int warn_template_debugging;
-
 /* Nonzero means warn about any identifiers that match in the first N
    characters.  The value N is in `id_clash_len'.  */
 
diff --git a/gcc/gcc.1 b/gcc/gcc.1
index 4667c2bfa31..d9543fa6edc 100644
--- a/gcc/gcc.1
+++ b/gcc/gcc.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation    -*-Text-*-
+.\" Copyright (c) 1991, 1992, 1993, 1994, 2000 Free Software Foundation    -*-Text-*-
 .\" See section COPYING for conditions for redistribution
 .\"
 .\" Set up \*(lq, \*(rq if -man hasn't already set it up.
@@ -20,7 +20,7 @@
 .if n .sp
 .if t .sp 0.4
 ..
-.Id $Id: gcc.1,v 1.12 1999/10/22 02:32:26 law Exp $
+.Id $Id: gcc.1,v 1.13 1999/11/02 10:23:46 law Exp $
 .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools"
 .SH NAME
 gcc, g++ \- GNU project C and C++ Compiler (gcc-2.96)
@@ -150,10 +150,8 @@ in the following sections.
 .TP
 .B Language Options
 \-ansi
-\-fall\-virtual
 \-fcond\-mismatch
 \-fdollars\-in\-identifiers
-\-fenum\-int\-equiv
 \-fexternal\-templates
 \-fno\-asm
 \-fno\-builtin
@@ -164,7 +162,6 @@ in the following sections.
 \-fno\-strict\-prototype
 \-fsigned\-bitfields
 \-fsigned\-char
-\-fthis\-is\-variable
 \-funsigned\-bitfields
 \-funsigned\-char
 \-fwritable\-strings
@@ -185,7 +182,6 @@ in the following sections.
 \-Wchar\-subscript
 \-Wcomment
 \-Wconversion
-\-Wenum\-clash
 \-Werror
 \-Wformat
 .RI \-Wid\-clash\- len
@@ -206,7 +202,6 @@ in the following sections.
 \-Wshadow
 \-Wstrict\-prototypes
 \-Wswitch
-\-Wtemplate\-debugging
 \-Wtraditional
 \-Wtrigraphs
 \-Wuninitialized
@@ -836,14 +831,6 @@ Attempt to support some aspects of traditional C compilers.
 For details, see the GNU C Manual; the duplicate list here
 has been deleted so that we won't get complaints when it
 is out of date.
-.Sp
-But one note about C++ programs only (not C).  `\|\c
-.B \-traditional\c
-\&\|' has one additional effect for C++: assignment to
-.B this
-is permitted.  This is the same as the effect of `\|\c
-.B \-fthis\-is\-variable\c
-\&\|'.
 .TP
 .B \-traditional\-cpp
 Attempt to support some aspects of traditional C preprocessors.
@@ -866,17 +853,6 @@ Permit the use of `\|\c
 \&\|' by default on some target systems
 but not others.)
 .TP
-.B \-fenum\-int\-equiv
-Permit implicit conversion of \c
-.B int\c
-\& to enumeration types (C++
-only).  Normally GNU C++ allows conversion of \c
-.B enum\c
-\& to \c
-.B int\c
-\&,
-but not the other way around.
-.TP
 .B \-fexternal\-templates
 Produce smaller code for template declarations, by generating only a
 single copy of each template function where it is defined (C++ only).
@@ -902,41 +878,10 @@ Conversely, when you compile using the default option
 \&\|', all template instantiations are
 explicitly internal.
 .TP
-.B \-fall\-virtual
-Treat all possible member functions as virtual, implicitly.  All
-member functions (except for constructor functions and
-.B new
-or
-.B delete
-member operators) are treated as virtual functions of the class where
-they appear.
-.Sp
-This does not mean that all calls to these member functions will be
-made through the internal table of virtual functions.  Under some
-circumstances, the compiler can determine that a call to a given
-virtual function can be made directly; in these cases the calls are
-direct in any case.
-.TP
 .B \-fcond\-mismatch
 Allow conditional expressions with mismatched types in the second and
 third arguments.  The value of such an expression is void.
 .TP
-.B \-fthis\-is\-variable
-Permit assignment to \c
-.B this\c
-\& (C++ only).  The incorporation of
-user-defined free store management into C++ has made assignment to
-`\|\c
-.B this\c
-\&\|' an anachronism.  Therefore, by default it is invalid to
-assign to \c
-.B this\c
-\& within a class member function.  However, for
-backwards compatibility, you can make it valid with
-`\|\c
-.B \-fthis-is-variable\c
-\&\|'.
-.TP
 .B \-funsigned\-char
 Let the type \c
 .B char\c
@@ -1863,10 +1808,6 @@ Some spurious warnings can be avoided if you declare as
 .B \-Wparentheses
 Warn if parentheses are omitted in certain contexts.
 .TP
-.B \-Wtemplate\-debugging
-When using templates in a C++ program, warn if debugging is not yet
-fully available (C++ only).
-.TP
 .B \-Wall
 All of the above `\|\c
 .B \-W\c
@@ -1995,14 +1936,6 @@ header files.
 Warn if anything is declared more than once in the same scope, even in
 cases where multiple declaration is valid and changes nothing.
 .TP
-.B \-Wnested-externs
-Warn if an \c
-.B extern\c
-\& declaration is encountered within an function.
-.TP
-.B \-Wenum\-clash
-Warn about conversion between different enumeration types (C++ only).
-.TP
 .B \-Wlong-long
 Warn if
 .B long long \c