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 | b9e38f19f78ea0416b276fa28922a6790415acd9 (patch) | |
| tree | 8761be435c0ada77ccc3d6a92033c63b05e29151 /clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp | |
| parent | d8c61785edb19ff4a0df8e06b4af65e7237ea3df (diff) | |
| download | bcm5719-llvm-b9e38f19f78ea0416b276fa28922a6790415acd9.tar.gz bcm5719-llvm-b9e38f19f78ea0416b276fa28922a6790415acd9.zip | |
Specialize the diagnostic complaining about conflicting types of
return statements within a lambda; this diagnostic previously referred
to blocks.
llvm-svn: 150584
Diffstat (limited to 'clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp')
| -rw-r--r-- | clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp index 586825f0531..d816e1702a6 100644 --- a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp +++ b/clang/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); } |
