diff options
author | Jason Merrill <jason@gcc.gnu.org> | 2009-09-30 11:49:31 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2009-09-30 11:49:31 -0400 |
commit | f09666518db82cc75802010688cdf8cf4a6ea0ef (patch) | |
tree | 1dd86b5134f830d2424ade51facf827a2c0e73fc /gcc | |
parent | 23823e0a4e7c4f7075f512b6d38fcd634adbab2a (diff) | |
download | gcc-f09666518db82cc75802010688cdf8cf4a6ea0ef.zip gcc-f09666518db82cc75802010688cdf8cf4a6ea0ef.tar.gz gcc-f09666518db82cc75802010688cdf8cf4a6ea0ef.tar.bz2 |
remove utf8
From-SVN: r152331
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/parser.c | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index deded00..0ed7d2a 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -7408,13 +7408,13 @@ cp_parser_lambda_body (cp_parser* parser, tree lambda_expr) /* 5.1.1.4 of the standard says: If a lambda-expression does not include a trailing-return-type, it is as if the trailing-return-type denotes the following type: - — if the compound-statement is of the form + * if the compound-statement is of the form { return attribute-specifier [opt] expression ; } the type of the returned expression after lvalue-to-rvalue conversion (_conv.lval_ 4.1), array-to-pointer conversion (_conv.array_ 4.2), and function-to-pointer conversion (_conv.func_ 4.3); - — otherwise, void. */ + * otherwise, void. */ /* In a lambda that has neither a lambda-return-type-clause nor a deducible form, errors should be reported for return statements diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C index 92dee70..4abdf59 100644 --- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C @@ -3,7 +3,7 @@ int main() { int i = 0; - int& r = [&] () { return i; } (); // { dg-error "" "invalid initialization of non-const reference of type ‘int&’ from a temporary of type ‘int’" } + int& r = [&] () { return i; } (); // { dg-error "" "invalid initialization of non-const reference of type .int&. from a temporary of type .int." } return 0; } |