diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-19 20:55:27 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-19 20:55:27 +0000 |
| commit | 6163a12583f18b52e52e31f9084fe6d51b6f675c (patch) | |
| tree | 1e0b709ce5a70aacdf2f57b1ae07b31bd68bf02e /gcc/c-tree.h | |
| parent | f1556d890022ee37b09cbce9b1d513188099ec57 (diff) | |
| download | gcc-6163a12583f18b52e52e31f9084fe6d51b6f675c.tar.gz | |
./:
* tree-cfg.c (gimple_redirect_edge_and_branch): Change ERROR_MARK
to GIMPLE_ERROR_MARK.
* c-typeck.c (build_conditional_expr): Add op1_original_type and
op2_original_type parameters. Warn about using different enum
types.
* c-parser.c (c_parser_conditional_expression): Pass original
types to build_conditional_expr.
* c-tree.h (build_conditional_expr): Update declaration.
testsuite/:
* gcc.dg/Wcxx-compat-18.c: New testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148727 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-tree.h')
| -rw-r--r-- | gcc/c-tree.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/c-tree.h b/gcc/c-tree.h index 9d3d2f30da0..c01cc664fe8 100644 --- a/gcc/c-tree.h +++ b/gcc/c-tree.h @@ -556,7 +556,8 @@ extern struct c_expr parser_build_unary_op (location_t, enum tree_code, extern struct c_expr parser_build_binary_op (location_t, enum tree_code, struct c_expr, struct c_expr); -extern tree build_conditional_expr (location_t, tree, bool, tree, tree); +extern tree build_conditional_expr (location_t, tree, bool, tree, tree, + tree, tree); extern tree build_compound_expr (location_t, tree, tree); extern tree c_cast_expr (location_t, struct c_type_name *, tree); extern tree build_c_cast (location_t, tree, tree); |