summaryrefslogtreecommitdiff
path: root/test/CXX/expr/expr.prim
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
commitc869e6070748b2532327ee5ad7fba4dc8925b359 (patch)
treedecde7a743a77d44443ffa8a8fc1170680a08d60 /test/CXX/expr/expr.prim
parentbe8f948807d8d37de27bb57cffbc8ab61e8f1bad (diff)
downloadclang-c869e6070748b2532327ee5ad7fba4dc8925b359.tar.gz
Clarify the error message when the reason the conversion is not viable is because the returned value does not match the function return type.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@245979 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX/expr/expr.prim')
-rw-r--r--test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp b/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
index c18bb7d192..e40761770d 100644
--- a/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
+++ b/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);