aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-03-16 22:39:37 -0400
committerJason Merrill <jason@gcc.gnu.org>2013-03-16 22:39:37 -0400
commitbc0c6b150e8695742921655f51267c53ec8db09a (patch)
treeaa69949c3d236e068badfce33429cb91416ee014 /gcc
parentcae7d26460f523a98305e054c3eb3d1e5726654b (diff)
downloadgcc-bc0c6b150e8695742921655f51267c53ec8db09a.zip
gcc-bc0c6b150e8695742921655f51267c53ec8db09a.tar.gz
gcc-bc0c6b150e8695742921655f51267c53ec8db09a.tar.bz2
parser.c (cp_parser_lambda_declarator_opt): Use cp_parser_trailing_type_id.
* parser.c (cp_parser_lambda_declarator_opt): Use cp_parser_trailing_type_id. From-SVN: r196745
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/parser.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5e42ff5..e6dec02 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2013-03-16 Jason Merrill <jason@redhat.com>
+ * parser.c (cp_parser_lambda_declarator_opt): Use
+ cp_parser_trailing_type_id.
+
PR c++/45917
* parser.c (cp_parser_template_id): Don't forget access checks.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 47ff995..8b6dbe1 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -8554,7 +8554,8 @@ cp_parser_lambda_declarator_opt (cp_parser* parser, tree lambda_expr)
if (cp_lexer_next_token_is (parser->lexer, CPP_DEREF))
{
cp_lexer_consume_token (parser->lexer);
- LAMBDA_EXPR_RETURN_TYPE (lambda_expr) = cp_parser_type_id (parser);
+ LAMBDA_EXPR_RETURN_TYPE (lambda_expr)
+ = cp_parser_trailing_type_id (parser);
}
/* The function parameters must be in scope all the way until after the