aboutsummaryrefslogtreecommitdiff
path: root/test/Misc/diag-template-diffing-color.cpp
diff options
context:
space:
mode:
authorRichard Trieu <rtrieu@google.com>2012-06-29 23:11:10 +0000
committerRichard Trieu <rtrieu@google.com>2012-06-29 23:11:10 +0000
commit648e7630008aac5caa591bcc6d0f77b9594b85fd (patch)
tree78f5056475494641d178ee3aa37ffada0fa821c2 /test/Misc/diag-template-diffing-color.cpp
parent7e68ba5660a9b2b854df4ae7a556e6b91d738c6c (diff)
Fix typos from r159463 and update tests. Added Matt Beaumont-Gay's suggestion
to improve wording of a diagnostic message. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159473 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Misc/diag-template-diffing-color.cpp')
-rw-r--r--test/Misc/diag-template-diffing-color.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Misc/diag-template-diffing-color.cpp b/test/Misc/diag-template-diffing-color.cpp
index b944ef2bb0..fc100e30dd 100644
--- a/test/Misc/diag-template-diffing-color.cpp
+++ b/test/Misc/diag-template-diffing-color.cpp
@@ -7,13 +7,13 @@ int main() {
func(foo<double>());
}
// CHECK: {{.*}}candidate function not viable: no known conversion from 'foo<{{.}}[0;1;36mdouble{{.}}[0m>' to 'foo<{{.}}[0;1;36mint{{.}}[0m>' for 1st argument{{.}}[0m
-// TREE: candidate function not viable: no known conversion for 1st argument
+// TREE: candidate function not viable: no known conversion from argument type to parameter type for 1st argument
// TREE: foo<
// TREE: [{{.}}[0;1;36mdouble{{.}}[0m != {{.}}[0;1;36mint{{.}}[0m]>{{.}}[0m
foo<int> A;
foo<double> &B = A;
// CHECK: {{.*}}non-const lvalue reference to type 'foo<{{.}}[0;1;36mdouble{{.}}[0m{{.}}[1m>' cannot bind to a value of unrelated type 'foo<{{.}}[0;1;36mint{{.}}[0m{{.}}[1m>'{{.}}[0m
-// TREE: non-const lvalue reference cannot bind to a value of related type
+// TREE: non-const lvalue reference cannot bind to a value of unrelated type
// TREE: foo<
// TREE: [{{.}}[0;1;36mdouble{{.}}[0m{{.}}[1m != {{.}}[0;1;36mint{{.}}[0m{{.}}[1m]>{{.}}[0m