diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-08-31 12:54:18 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-08-31 12:54:18 +0000 |
| commit | 723d9ad3aab8244f2cbf1fa1e5448a6ad0cde808 (patch) | |
| tree | 065cb3f79e79c9e98619d6b06cad730a6f8fe744 /gcc/cp/cvt.c | |
| parent | 323009606a96187255772296ba243cab98f4c76c (diff) | |
| download | gcc-723d9ad3aab8244f2cbf1fa1e5448a6ad0cde808.tar.gz | |
* cp-tree.h, decl2.c: Remove support for -fall-virtual,
-fenum-int-equivalence and -fno-nonnull-objects.
* class.c (check_for_override): Remove support for -fall-virtual.
(finish_struct_1): Likewise.
* call.c (build_new_op): Remove support for -fenum-int-equivalence.
* typeck.c (build_binary_op_nodefault): Likewise.
* cvt.c (ocp_convert): Likewise.
* call.c (build_vfield_ref): Remove support for -fno-nonnull-objects.
* class.c (build_vbase_path): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22131 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index ff69fbfabaf..7a07282a423 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -700,8 +700,7 @@ ocp_convert (type, expr, convtype, flags) tree intype = TREE_TYPE (e); /* enum = enum, enum = int, enum = float, (enum)pointer are all errors. */ - if (flag_int_enum_equivalence == 0 - && TREE_CODE (type) == ENUMERAL_TYPE + if (TREE_CODE (type) == ENUMERAL_TYPE && ((ARITHMETIC_TYPE_P (intype) && ! (convtype & CONV_STATIC)) || (TREE_CODE (intype) == POINTER_TYPE))) { |