diff options
| author | dim <dim@FreeBSD.org> | 2015-12-30 11:49:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-12-30 11:49:41 +0000 |
| commit | 3176e97f130184ece0e1a21352c8124cc83ff24a (patch) | |
| tree | 0a5b74c0b9ca73aded34df95c91fcaf3815230d8 /test/Modules/merge-using-decls.cpp | |
| parent | 1e9b8d38881c3213d1e67b0c47ab9b2c00721a5c (diff) | |
| download | FreeBSD-src-3176e97f130184ece0e1a21352c8124cc83ff24a.zip FreeBSD-src-3176e97f130184ece0e1a21352c8124cc83ff24a.tar.gz | |
Vendor import of clang trunk r256633:
https://llvm.org/svn/llvm-project/cfe/trunk@256633
Diffstat (limited to 'test/Modules/merge-using-decls.cpp')
| -rw-r--r-- | test/Modules/merge-using-decls.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/Modules/merge-using-decls.cpp b/test/Modules/merge-using-decls.cpp index 789f75b..98989d1 100644 --- a/test/Modules/merge-using-decls.cpp +++ b/test/Modules/merge-using-decls.cpp @@ -31,6 +31,8 @@ template int UseAll<YA>(); template int UseAll<YB>(); template int UseAll<Y>(); +// Which of these two sets of diagnostics is chosen is not important. It's OK +// if this varies with ORDER, but it must be consistent across runs. #if ORDER == 1 // Here, we're instantiating the definition from 'A' and merging the definition // from 'B' into it. |
