diff options
Diffstat (limited to 'clang/test/Modules/merge-using-decls.cpp')
| -rw-r--r-- | clang/test/Modules/merge-using-decls.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/test/Modules/merge-using-decls.cpp b/clang/test/Modules/merge-using-decls.cpp index 789f75b5740..15d4af4837a 100644 --- a/clang/test/Modules/merge-using-decls.cpp +++ b/clang/test/Modules/merge-using-decls.cpp @@ -31,7 +31,9 @@ template int UseAll<YA>(); template int UseAll<YB>(); template int UseAll<Y>(); -#if ORDER == 1 +// 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 1 // Here, we're instantiating the definition from 'A' and merging the definition // from 'B' into it. |
