diff options
Diffstat (limited to 'clang-tools-extra/clang-tidy/utils')
6 files changed, 12 insertions, 8 deletions
diff --git a/clang-tools-extra/clang-tidy/utils/BracesAroundStatement.h b/clang-tools-extra/clang-tidy/utils/BracesAroundStatement.h index 699d754..53ce2e0 100644 --- a/clang-tools-extra/clang-tidy/utils/BracesAroundStatement.h +++ b/clang-tools-extra/clang-tidy/utils/BracesAroundStatement.h @@ -68,7 +68,7 @@ private: /// The algorithm computing them respects comment before and after the statement /// and adds line breaks before the braces accordingly. BraceInsertionHints -getBraceInsertionsHints(const Stmt *const S, const LangOptions &LangOpts, +getBraceInsertionsHints(const Stmt *S, const LangOptions &LangOpts, const SourceManager &SM, SourceLocation StartLoc, SourceLocation EndLocHint = SourceLocation()); diff --git a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp index 086c7f3..b30c83e 100644 --- a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp +++ b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp @@ -21,6 +21,11 @@ FixItHint changeVarDeclToReference(const VarDecl &Var, ASTContext &Context) { SourceLocation AmpLocation = Var.getLocation(); auto Token = utils::lexer::getPreviousToken( AmpLocation, Context.getSourceManager(), Context.getLangOpts()); + + // For parameter packs the '&' must go before the '...' token + if (Token.is(tok::ellipsis)) + return FixItHint::CreateInsertion(Token.getLocation(), "&"); + if (!Token.is(tok::unknown)) AmpLocation = Lexer::getLocForEndOfToken(Token.getLocation(), 0, Context.getSourceManager(), diff --git a/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp index 58e3356..7e2aad9 100644 --- a/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp +++ b/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp @@ -118,9 +118,8 @@ static int compareHeaders(StringRef LHS, StringRef RHS, return LHS.compare(RHS); } -IncludeSorter::IncludeSorter(const SourceManager *SourceMgr, - const FileID FileID, StringRef FileName, - IncludeStyle Style) +IncludeSorter::IncludeSorter(const SourceManager *SourceMgr, FileID FileID, + StringRef FileName, IncludeStyle Style) : SourceMgr(SourceMgr), Style(Style), CurrentFileID(FileID), CanonicalFile(makeCanonicalName(FileName, Style)) {} diff --git a/clang-tools-extra/clang-tidy/utils/IncludeSorter.h b/clang-tools-extra/clang-tidy/utils/IncludeSorter.h index ce752c4..66830ee 100644 --- a/clang-tools-extra/clang-tidy/utils/IncludeSorter.h +++ b/clang-tools-extra/clang-tidy/utils/IncludeSorter.h @@ -23,7 +23,7 @@ namespace utils { class IncludeSorter { public: /// Supported include styles. - enum IncludeStyle { IS_LLVM = 0, IS_Google = 1, IS_Google_ObjC }; + enum IncludeStyle { IS_LLVM = 0, IS_Google = 1, IS_Google_ObjC = 2 }; /// The classifications of inclusions, in the order they should be sorted. enum IncludeKinds { @@ -37,7 +37,7 @@ public: /// ``IncludeSorter`` constructor; takes the FileID and name of the file to be /// processed by the sorter. - IncludeSorter(const SourceManager *SourceMgr, const FileID FileID, + IncludeSorter(const SourceManager *SourceMgr, FileID FileID, StringRef FileName, IncludeStyle Style); /// Adds the given include directive to the sorter. diff --git a/clang-tools-extra/clang-tidy/utils/Matchers.h b/clang-tools-extra/clang-tidy/utils/Matchers.h index 6caa35d..4eac065 100644 --- a/clang-tools-extra/clang-tidy/utils/Matchers.h +++ b/clang-tools-extra/clang-tidy/utils/Matchers.h @@ -51,7 +51,7 @@ AST_MATCHER_FUNCTION(ast_matchers::TypeMatcher, isPointerToConst) { // Returns QualType matcher for target char type only. AST_MATCHER(QualType, isSimpleChar) { - const auto ActualType = Node.getTypePtr(); + const auto *ActualType = Node.getTypePtr(); return ActualType && (ActualType->isSpecificBuiltinType(BuiltinType::Char_S) || ActualType->isSpecificBuiltinType(BuiltinType::Char_U)); diff --git a/clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.h b/clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.h index 68b3040..b38bc08 100644 --- a/clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.h +++ b/clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.h @@ -28,7 +28,7 @@ namespace tidy { class RenamerClangTidyCheck : public ClangTidyCheck { public: RenamerClangTidyCheck(StringRef CheckName, ClangTidyContext *Context); - ~RenamerClangTidyCheck(); + ~RenamerClangTidyCheck() override; /// Derived classes should not implement any matching logic themselves; this /// class will do the matching and call the derived class' |