summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2015-05-04 03:15:55 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2015-05-04 03:15:55 +0000
commit33de8566f0d12646734b8f00666da163d4306b44 (patch)
tree158ee2aebe81ed2246a58947d45b72f0ddc5dff2 /clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
parent36bd40df7252be541973580e27c7bcbd62e6a605 (diff)
downloadbcm5719-llvm-33de8566f0d12646734b8f00666da163d4306b44.tar.gz
bcm5719-llvm-33de8566f0d12646734b8f00666da163d4306b44.zip
Update to match clang r236404.
llvm-svn: 236405
Diffstat (limited to 'clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp')
-rw-r--r--clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp b/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
index 6fbc885e0a4..a981bfb9b9e 100644
--- a/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
+++ b/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
@@ -58,7 +58,7 @@ public:
}
void Ifndef(SourceLocation Loc, const Token &MacroNameTok,
- const MacroDirective *MD) override {
+ const MacroDefinition &MD) override {
if (MD)
return;
@@ -71,7 +71,7 @@ public:
const MacroDirective *MD) override {
// Record all defined macros. We store the whole token to get info on the
// name later.
- Macros.emplace_back(MacroNameTok, MD);
+ Macros.emplace_back(MacroNameTok, MD->getMacroInfo());
}
void Endif(SourceLocation Loc, SourceLocation IfLoc) override {
@@ -84,7 +84,7 @@ public:
SourceManager &SM = PP->getSourceManager();
for (const auto &MacroEntry : Macros) {
- const MacroInfo *MI = MacroEntry.second->getMacroInfo();
+ const MacroInfo *MI = MacroEntry.second;
// We use clang's header guard detection. This has the advantage of also
// emitting a warning for cases where a pseudo header guard is found but
@@ -268,7 +268,7 @@ public:
}
private:
- std::vector<std::pair<Token, const MacroDirective *>> Macros;
+ std::vector<std::pair<Token, const MacroInfo *>> Macros;
llvm::StringMap<const FileEntry *> Files;
std::map<const IdentifierInfo *, std::pair<SourceLocation, SourceLocation>>
Ifndefs;
OpenPOWER on IntegriCloud