diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-02-15 15:57:22 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-02-15 15:57:22 +0000 |
| commit | 4e88df72e690498aeba2dc3d5089388b27be66fa (patch) | |
| tree | 61f5639624fbd82d698db99e6fea1833f17676c4 /test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp | |
| parent | 81f3bff7c202d688c9298bc049fdb5b6f77057b1 (diff) | |
Specialize the diagnostic complaining about conflicting types of
return statements within a lambda; this diagnostic previously referred
to blocks.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150584 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp')
| -rw-r--r-- | test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp b/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp index 586825f053..d816e1702a 100644 --- a/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp +++ b/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp @@ -37,8 +37,8 @@ X infer_X_return_type_fail(X x) { return [x](int y) { // expected-warning{{omitted result type}} if (y > 0) return X(); - else // FIXME: shouldn't mention blocks - return x; // expected-error{{return type 'const X' must match previous return type 'X' when block literal has unspecified explicit return type}} + else + return x; // expected-error{{return type 'const X' must match previous return type 'X' when lambda expression has unspecified explicit return type}} }(5); } |