diff options
| author | dim <dim@FreeBSD.org> | 2014-11-24 09:15:30 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-24 09:15:30 +0000 |
| commit | 173a4f43a911175643bda81ee675e8d9269056ea (patch) | |
| tree | 47df2c12b57214af6c31e47404b005675b8b7ffc /test/Modules/linkage-merge.cpp | |
| parent | 88f7a7d5251a2d813460274c92decc143a11569b (diff) | |
| download | FreeBSD-src-173a4f43a911175643bda81ee675e8d9269056ea.zip FreeBSD-src-173a4f43a911175643bda81ee675e8d9269056ea.tar.gz | |
Vendor import of clang RELEASE_350/final tag r216957 (effectively, 3.5.0 release):
https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_350/final@216957
Diffstat (limited to 'test/Modules/linkage-merge.cpp')
| -rw-r--r-- | test/Modules/linkage-merge.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/Modules/linkage-merge.cpp b/test/Modules/linkage-merge.cpp index 9cc9ae6..664716d 100644 --- a/test/Modules/linkage-merge.cpp +++ b/test/Modules/linkage-merge.cpp @@ -7,6 +7,5 @@ static int f(int); int f(int); static void g(int); -// expected-error@-1 {{declaration conflicts with target of using declaration already in scope}} -// expected-note@Inputs/linkage-merge-foo.h:2 {{target of using declaration}} -// expected-note@Inputs/linkage-merge-bar.h:3 {{using declaration}} +// expected-error@-1 {{functions that differ only in their return type cannot be overloaded}} +// expected-note@Inputs/linkage-merge-foo.h:2 {{previous declaration is here}} |
