diff options
| author | Peter Bergner <bergner@vnet.ibm.com> | 2016-08-03 17:42:15 +0000 |
|---|---|---|
| committer | Peter Bergner <bergner@vnet.ibm.com> | 2016-08-03 17:42:15 +0000 |
| commit | 3055bfa7109d64b711c72e2091646fa3caa999f2 (patch) | |
| tree | e217aa2f523fcc0b9b1b82aa54e06cb20c33bb9b /gcc/cp/typeck.c | |
| parent | 6dc26956185ac7fa84bf72036c4f9fc258078241 (diff) | |
| parent | 9292dc98baf244da9c72b5c1c74ab87d961c381d (diff) | |
Merge up to 239078.ibm/gcc-4_9-branch
Upstream FSF 4.9 release branch is now closed.
* REVISION: Update subversion id.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ibm/gcc-4_9-branch@239087 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/typeck.c')
| -rw-r--r-- | gcc/cp/typeck.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index b3d3dfc77ed..6ed91251c96 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -6055,8 +6055,7 @@ build_x_conditional_expr (location_t loc, tree ifexp, tree op1, tree op2, } expr = build_conditional_expr (loc, ifexp, op1, op2, complain); - if (processing_template_decl && expr != error_mark_node - && TREE_CODE (expr) != VEC_COND_EXPR) + if (processing_template_decl && expr != error_mark_node) { tree min = build_min_non_dep (COND_EXPR, expr, orig_ifexp, orig_op1, orig_op2); |