diff options
| author | dim <dim@FreeBSD.org> | 2011-02-20 13:06:31 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-02-20 13:06:31 +0000 |
| commit | 39fcc9a984e2820e4ea0fa2ac4abd17d9f3a31df (patch) | |
| tree | a9243275843fbeaa590afc07ee888e006b8d54ea /test/ASTMerge/category.m | |
| parent | 69b4eca4a4255ba43baa5c1d9bbdec3ec17f479e (diff) | |
| download | FreeBSD-src-39fcc9a984e2820e4ea0fa2ac4abd17d9f3a31df.zip FreeBSD-src-39fcc9a984e2820e4ea0fa2ac4abd17d9f3a31df.tar.gz | |
Vendor import of clang trunk r126079:
http://llvm.org/svn/llvm-project/cfe/trunk@126079
Diffstat (limited to 'test/ASTMerge/category.m')
| -rw-r--r-- | test/ASTMerge/category.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/ASTMerge/category.m b/test/ASTMerge/category.m index 6ba2292..54a1240 100644 --- a/test/ASTMerge/category.m +++ b/test/ASTMerge/category.m @@ -6,4 +6,6 @@ // CHECK: category1.m:16:1: note: instance method 'method2' also declared here // CHECK: category2.m:26:1: error: instance method 'method3' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: category1.m:24:1: note: instance method 'method3' also declared here -// CHECK: 2 errors generated. +// CHECK: category2.m:48:1: error: instance method 'blah' has incompatible result types in different translation units ('int' vs. 'float') +// CHECK: category1.m:46:1: note: instance method 'blah' also declared here +// CHECK: 3 errors generated. |
