From: Joseph Huber <jhuber6@vols.utk.edu>
Date: Tue, 18 Jul 2023 16:41:24 +0000 (-0500)
Subject: [Clangd] Fix ambiguous use of 'Range'
X-Git-Tag: upstream/17.0.6~1322
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6b98b7eff28de52927fb2ce7030e97ac363e1c0;p=platform%2Fupstream%2Fllvm.git

[Clangd] Fix ambiguous use of 'Range'

Summary:
The changes in D155173 caused build failures on some configruations due
to the use of `Range` which conflicts with other definitions. Explicitly
use `clangd::Range`.
---

diff --git a/clang-tools-extra/clangd/ClangdServer.h b/clang-tools-extra/clangd/ClangdServer.h
index 9b77984..88b6d2f 100644
--- a/clang-tools-extra/clangd/ClangdServer.h
+++ b/clang-tools-extra/clangd/ClangdServer.h
@@ -353,7 +353,7 @@ public:
 
   // Ref to the clangd::Diag.
   struct DiagRef {
-    Range Range;
+    clangd::Range Range;
     std::string Message;
     bool operator==(const DiagRef &Other) const {
       return std::tie(Range, Message) == std::tie(Other.Range, Other.Message);