diff options
| author | Jason Merrill <jason@redhat.com> | 2011-09-07 13:11:49 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-09-07 13:11:49 -0400 |
| commit | e39438c55d8d22f9ede589d3fc19bacd639be58b (patch) | |
| tree | 0ca043664c1eece6adcfe41dd1397340888cb18d /gcc/cp | |
| parent | 30288f9aa21c6ef870bdf792a1eee4f90fd2c468 (diff) | |
| download | gcc-e39438c55d8d22f9ede589d3fc19bacd639be58b.zip gcc-e39438c55d8d22f9ede589d3fc19bacd639be58b.tar.gz gcc-e39438c55d8d22f9ede589d3fc19bacd639be58b.tar.bz2 | |
re PR c++/50298 ([C++0x][constexpr] References cannot be bound to static constexpr reference members)
PR c++/50298
* parser.c (cp_parser_member_declaration): Don't require a constant
rvalue here in C++0x.
From-SVN: r178652
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ea67d2d..1c6c5a1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-09-07 Jason Merrill <jason@redhat.com> + PR c++/50298 + * parser.c (cp_parser_member_declaration): Don't require a constant + rvalue here in C++0x. + * pt.c (type_unification_real): Correct complain arg for tsubsting default template args. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 7d766d13..6346aa0 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18187,6 +18187,17 @@ cp_parser_member_declaration (cp_parser* parser) initializer_token_start = cp_lexer_peek_token (parser->lexer); if (function_declarator_p (declarator)) initializer = cp_parser_pure_specifier (parser); + else if (cxx_dialect >= cxx0x) + { + bool nonconst; + /* Don't require a constant rvalue in C++11, since we + might want a reference constant. We'll enforce + constancy later. */ + cp_lexer_consume_token (parser->lexer); + /* Parse the initializer. */ + initializer = cp_parser_initializer_clause (parser, + &nonconst); + } else /* Parse the initializer. */ initializer = cp_parser_constant_initializer (parser); |