From 3176e97f130184ece0e1a21352c8124cc83ff24a Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 30 Dec 2015 11:49:41 +0000 Subject: Vendor import of clang trunk r256633: https://llvm.org/svn/llvm-project/cfe/trunk@256633 --- test/Modules/merge-using-decls.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/Modules/merge-using-decls.cpp') 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(); template int UseAll(); template int UseAll(); +// 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. -- cgit v1.1