[clang-tools-extra] 7fc533a - [clangd] Fix windows builds failing on check-clangd

[via cfe-commits]

Author: njames93
Date: 2020-06-14T13:29:17+01:00
New Revision: 7fc533a1d8de25e74c4829a9d868dbebd498492c

URL: https://github.com/llvm/llvm-project/commit/7fc533a1d8de25e74c4829a9d868dbebd498492c
DIFF: https://github.com/llvm/llvm-project/commit/7fc533a1d8de25e74c4829a9d868dbebd498492c.diff

LOG: [clangd] Fix windows builds failing on check-clangd

Added: 
    

Modified: 
    clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
index dbeff4deb444..fcc6d40a988a 100644
--- a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -45,9 +45,15 @@ ::testing::Matcher<const Diag &> WithFix(::testing::Matcher<Fix> FixMatcher1,
   return Field(&Diag::Fixes, UnorderedElementsAre(FixMatcher1, FixMatcher2));
 }
 
-template <typename... NoteMatcherTypes>
-::testing::Matcher<const Diag &> WithNote(NoteMatcherTypes... NoteMatcher) {
-  return Field(&Diag::Notes, ElementsAre(NoteMatcher...));
+::testing::Matcher<const Diag &>
+WithNote(::testing::Matcher<Note> NoteMatcher) {
+  return Field(&Diag::Notes, ElementsAre(NoteMatcher));
+}
+
+::testing::Matcher<const Diag &>
+WithNote(::testing::Matcher<Note> NoteMatcher1,
+         ::testing::Matcher<Note> NoteMatcher2) {
+  return Field(&Diag::Notes, UnorderedElementsAre(NoteMatcher1, NoteMatcher2));
 }
 
 MATCHER_P2(Diag, Range, Message,