diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-07-26 23:45:07 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-07-26 23:45:07 +0000 |
commit | 1836e600234bc53bf0db60cbedc750ed635fd62d (patch) | |
tree | 08ce88c84901fe8f33e88a57767122103a97b632 /clang/test/CXX/expr/expr.prim/expr.prim.lambda | |
parent | 3cf7eb50a9b9096f8a26ab2e232f1dd62b221a87 (diff) | |
download | bcm5719-llvm-1836e600234bc53bf0db60cbedc750ed635fd62d.tar.gz bcm5719-llvm-1836e600234bc53bf0db60cbedc750ed635fd62d.zip |
Handle a difference in lambda return type deduction between C++11 and C++1y: if
no return type is specified, C++11 will deduce a cv-qualified return type in
some cases, but C++1y never will.
llvm-svn: 187275
Diffstat (limited to 'clang/test/CXX/expr/expr.prim/expr.prim.lambda')
-rw-r--r-- | clang/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp | 5 |
1 files changed, 4 insertions, 1 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 368b3f695b9..c69aa115beb 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 @@ -39,7 +39,10 @@ X infer_X_return_type_fail(X x) { if (y > 0) return X(); else - return x; // expected-error{{return type 'const X' must match previous return type 'X' when lambda expression has unspecified explicit return type}} + return x; +#if __cplusplus <= 201103L + // expected-error@-2 {{return type 'const X' must match previous return type 'X' when lambda expression has unspecified explicit return type}} +#endif }(5); } |