summaryrefslogtreecommitdiffstats
path: root/clang/test/CXX/expr/expr.prim/expr.prim.lambda
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2015-08-25 22:18:46 +0000
committerNick Lewycky <nicholas@mxc.ca>2015-08-25 22:18:46 +0000
commit08426e2098aaab9b26bf236fe6ce9570e9ea3c4a (patch)
tree294e5d3830930947e85299fda9fe1ed902c528bc /clang/test/CXX/expr/expr.prim/expr.prim.lambda
parent73a7c93a0a55d5fea3c91dd5a21eb237eb7fddf0 (diff)
downloadbcm5719-llvm-08426e2098aaab9b26bf236fe6ce9570e9ea3c4a.tar.gz
bcm5719-llvm-08426e2098aaab9b26bf236fe6ce9570e9ea3c4a.zip
Clarify the error message when the reason the conversion is not viable is because the returned value does not match the function return type.
llvm-svn: 245979
Diffstat (limited to 'clang/test/CXX/expr/expr.prim/expr.prim.lambda')
-rw-r--r--clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
index c18bb7d1921..e40761770d5 100644
--- a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
+++ b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
@@ -38,7 +38,7 @@ template X captures(X, X);
template<typename T>
int infer_result(T x, T y) {
auto lambda = [=](bool b) { return x + y; };
- return lambda(true); // expected-error{{no viable conversion from 'X' to 'int'}}
+ return lambda(true); // expected-error{{no viable conversion from returned value of type 'X' to function return type 'int'}}
}
template int infer_result(int, int);
OpenPOWER on IntegriCloud