[clang-tools-extra] e6b98b7 - [Clangd] Fix ambiguous use of 'Range'

Joseph Huber via cfe-commits cfe-commits at lists.llvm.org
Tue Jul 18 09:42:40 PDT 2023


Author: Joseph Huber
Date: 2023-07-18T11:41:24-05:00
New Revision: e6b98b7eff28de52927fb2ce7030e97ac363e1c0

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

LOG: [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`.

Added: 
    

Modified: 
    clang-tools-extra/clangd/ClangdServer.h

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/ClangdServer.h b/clang-tools-extra/clangd/ClangdServer.h
index 9b779841e9ed45..88b6d2f11d9a0b 100644
--- a/clang-tools-extra/clangd/ClangdServer.h
+++ b/clang-tools-extra/clangd/ClangdServer.h
@@ -353,7 +353,7 @@ class ClangdServer {
 
   // 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);


        


More information about the cfe-commits mailing list