summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/clang-tidy/llvm
diff options
context:
space:
mode:
authorJulie Hockett <juliehockett@google.com>2018-05-09 22:25:43 +0000
committerJulie Hockett <juliehockett@google.com>2018-05-09 22:25:43 +0000
commit4a4384353221b845eccdb631a0f83c66a2544a3c (patch)
treea3cf775c17bb23d9b36bccf6b3508e5f0b67b77f /clang-tools-extra/clang-tidy/llvm
parent06af01bbc23d422df3bbac82752b935fa217893d (diff)
downloadbcm5719-llvm-4a4384353221b845eccdb631a0f83c66a2544a3c.tar.gz
bcm5719-llvm-4a4384353221b845eccdb631a0f83c66a2544a3c.zip
Revert "[tools] Updating PPCallbacks::InclusionDirective calls"
This reverts commit r331905, since it's dependent on reverted r331905. llvm-svn: 331931
Diffstat (limited to 'clang-tools-extra/clang-tidy/llvm')
-rw-r--r--clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp b/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp
index f1fdb39c263..c277a45d2a0 100644
--- a/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp
@@ -28,8 +28,7 @@ public:
StringRef FileName, bool IsAngled,
CharSourceRange FilenameRange, const FileEntry *File,
StringRef SearchPath, StringRef RelativePath,
- const Module *Imported,
- SrcMgr::CharacteristicKind FileType) override;
+ const Module *Imported) override;
void EndOfMainFile() override;
private:
@@ -77,8 +76,7 @@ static int getPriority(StringRef Filename, bool IsAngled, bool IsMainModule) {
void IncludeOrderPPCallbacks::InclusionDirective(
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
- StringRef SearchPath, StringRef RelativePath, const Module *Imported,
- SrcMgr::CharacteristicKind FileType) {
+ StringRef SearchPath, StringRef RelativePath, const Module *Imported) {
// We recognize the first include as a special main module header and want
// to leave it in the top position.
IncludeDirective ID = {HashLoc, FilenameRange, FileName, IsAngled, false};
OpenPOWER on IntegriCloud