From: Matthias Braun <matze@braunis.de>
Date: Sat, 15 Jul 2017 00:29:25 +0000 (+0000)
Subject: Try to fix modules build
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da2ce2e0d1fc5a79cabe7d7222246f4de98f53f0;p=clang

Try to fix modules build

Module builds somehow report an ambiguity between clang::Diagnostic and
clang::Tooling::Diagnostic. It seems as if one of the additional headers
brought in by the module brings the clang namespace to the toplevel. I
could not find out the reason for that, so for now I go with the simple
fix to bring the build back to green.

rdar://33321397

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@308071 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/unittests/Tooling/DiagnosticsYamlTest.cpp b/unittests/Tooling/DiagnosticsYamlTest.cpp
index 06b60202b9..83e09eaeef 100644
--- a/unittests/Tooling/DiagnosticsYamlTest.cpp
+++ b/unittests/Tooling/DiagnosticsYamlTest.cpp
@@ -18,6 +18,7 @@
 
 using namespace llvm;
 using namespace clang::tooling;
+using clang::tooling::Diagnostic;
 
 static Diagnostic makeDiagnostic(StringRef DiagnosticName,
                                  const std::string &Message, int FileOffset,