aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoseph Myers <jsm28@cam.ac.uk>2001-01-10 10:57:17 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2001-01-10 10:57:17 +0000
commita7537031e63966209d0b29e5123278afa030db77 (patch)
tree7a457eb4fdea25002033d55e30d2052ad5b90b81 /gcc
parent2642624b16f87187d60e6c303486fbbec9fd6329 (diff)
downloadgcc-a7537031e63966209d0b29e5123278afa030db77.zip
gcc-a7537031e63966209d0b29e5123278afa030db77.tar.gz
gcc-a7537031e63966209d0b29e5123278afa030db77.tar.bz2
invoke.texi: Document that -fcond-mismatch isn't supported for C++.
* invoke.texi: Document that -fcond-mismatch isn't supported for C++. cp: * cp-tree.h (flag_cond_mismatch): Don't declare. * decl2.c (flag_cond_mismatch): Don't define. (lang_f_options): Remove cond-mismatch. (unsupported_options): Add cond-mismatch. From-SVN: r38864
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/cp-tree.h5
-rw-r--r--gcc/cp/decl2.c7
-rw-r--r--gcc/invoke.texi3
5 files changed, 15 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1a4b98..b0c0eac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2001-01-10 Joseph S. Myers <jsm28@cam.ac.uk>
+ * invoke.texi: Document that -fcond-mismatch isn't supported for
+ C++.
+
+2001-01-10 Joseph S. Myers <jsm28@cam.ac.uk>
+
* gcc.texi: Define macro gcctabopt.
* invoke.texi: Add manpage sections BUGS and AUTHOR. Use
@command, @env and @option in some places where appropriate. Use
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe4ee20..173e222 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-10 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * cp-tree.h (flag_cond_mismatch): Don't declare.
+ * decl2.c (flag_cond_mismatch): Don't define.
+ (lang_f_options): Remove cond-mismatch.
+ (unsupported_options): Add cond-mismatch.
+
2001-01-09 Nathan Sidwell <nathan@codesourcery.com>
* class.c (handle_using_decl): Reject using of constructor name
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index d0664b1..d0784e8 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -990,11 +990,6 @@ extern tree global_namespace;
extern int dollars_in_ident;
-/* Nonzero means allow type mismatches in conditional expressions;
- just make their values `void'. */
-
-extern int flag_cond_mismatch;
-
/* Nonzero means don't recognize the keyword `asm'. */
extern int flag_no_asm;
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index f051a45..4da673b 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -139,11 +139,6 @@ static tree decl_namespace_list;
/* C (and C++) language-specific option variables. */
-/* Nonzero means allow type mismatches in conditional expressions;
- just make their values `void'. */
-
-int flag_cond_mismatch;
-
/* Nonzero means don't recognize the keyword `asm'. */
int flag_no_asm;
@@ -492,7 +487,6 @@ lang_f_options[] =
{"short-enums", &flag_short_enums, 1},
{"short-double", &flag_short_double, 1},
{"short-wchar", &flag_short_wchar, 1},
- {"cond-mismatch", &flag_cond_mismatch, 1},
{"asm", &flag_no_asm, 0},
{"builtin", &flag_no_builtin, 0},
@@ -536,6 +530,7 @@ lang_f_options[] =
listed here. This table must be kept in alphabetical order. */
static const char * const unsupported_options[] = {
"all-virtual",
+ "cond-mismatch",
"enum-int-equiv",
"guiding-decls",
"nonnull-objects",
diff --git a/gcc/invoke.texi b/gcc/invoke.texi
index 753de4a..3d3caff 100644
--- a/gcc/invoke.texi
+++ b/gcc/invoke.texi
@@ -1071,7 +1071,8 @@ string constants can contain the newline character as typed.)
@item -fcond-mismatch
Allow conditional expressions with mismatched types in the second and
-third arguments. The value of such an expression is void.
+third arguments. The value of such an expression is void. This option
+is not supported for C++.
@item -funsigned-char
Let the type @code{char} be unsigned, like @code{unsigned char}.