diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b9ad026..264bc7c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-03-02 Jason Merrill <jason@redhat.com> + PR c++/47950 + * parser.c (cp_parser_condition): Don't fold_non_dependent_expr here. + PR c++/47774 * tree.c (build_vec_init_elt): Split out from... (build_vec_init_expr): ...here. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c63d5b3..510fcb1 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -8687,9 +8687,6 @@ cp_parser_condition (cp_parser* parser) if (BRACE_ENCLOSED_INITIALIZER_P (initializer)) maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS); - if (!non_constant_p) - initializer = fold_non_dependent_expr (initializer); - /* Process the initializer. */ cp_finish_decl (decl, initializer, !non_constant_p, |