[clang] caf86d2 - Speculatively fix this harder and with improved spelling capabilities.

[Aaron Ballman via cfe-commits]

Author: Aaron Ballman
Date: 2021-05-27T09:54:09-04:00
New Revision: caf86d2959d5e900ed29af5e0ae2be23e3d299c5

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

LOG: Speculatively fix this harder and with improved spelling capabilities.

Added: 
    

Modified: 
    clang/include/clang/Lex/PreprocessingRecord.h
    clang/lib/Index/IndexingAction.cpp

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Lex/PreprocessingRecord.h b/clang/include/clang/Lex/PreprocessingRecord.h
index 54489cb3a564..0137d871e916 100644
--- a/clang/include/clang/Lex/PreprocessingRecord.h
+++ b/clang/include/clang/Lex/PreprocessingRecord.h
@@ -539,7 +539,8 @@ class Token;
     void Ifndef(SourceLocation Loc, const Token &MacroNameTok,
                 const MacroDefinition &MD) override;
 
-    using PPCallbacks::Elifdef, PPCallback::Elifndef;
+    using PPCallbacks::Elifdef;
+    using PPCallbacks::Elifndef;
     void Elifdef(SourceLocation Loc, const Token &MacroNameTok,
                  const MacroDefinition &MD) override;
     void Elifndef(SourceLocation Loc, const Token &MacroNameTok,

diff  --git a/clang/lib/Index/IndexingAction.cpp b/clang/lib/Index/IndexingAction.cpp
index 65479a483b17..c9fcaad31128 100644
--- a/clang/lib/Index/IndexingAction.cpp
+++ b/clang/lib/Index/IndexingAction.cpp
@@ -78,6 +78,8 @@ class IndexPPCallbacks final : public PPCallbacks {
                                    *MD.getMacroInfo());
   }
 
+  using PPCallbacks::Elifdef;
+  using PPCallbacks::Elifndef;
   void Elifdef(SourceLocation Loc, const Token &MacroNameTok,
                const MacroDefinition &MD) override {
     if (!MD.getMacroInfo()) // Ignore non-existent macro.