diff options
Diffstat (limited to 'clang-tools-extra/cpp11-migrate/AddOverride')
4 files changed, 10 insertions, 11 deletions
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp index db38fa64b56..9a13c044e5d 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp @@ -29,13 +29,13 @@ static cl::opt<bool> DetectMacros( cl::desc("Detect and use macros that expand to the 'override' keyword."), cl::cat(TransformsOptionsCategory)); -int AddOverrideTransform::apply(FileOverrides &InputStates, +int AddOverrideTransform::apply(const FileOverrides &InputStates, const CompilationDatabase &Database, const std::vector<std::string> &SourcePaths) { ClangTool AddOverrideTool(Database, SourcePaths); unsigned AcceptedChanges = 0; MatchFinder Finder; - AddOverrideFixer Fixer(getReplacements(), AcceptedChanges, DetectMacros, + AddOverrideFixer Fixer(AcceptedChanges, DetectMacros, /*Owner=*/ *this); Finder.addMatcher(makeCandidateForOverrideAttrMatcher(), &Fixer); diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h index 81ceaed859c..8c39775e48d 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h @@ -31,7 +31,7 @@ public: : Transform("AddOverride", Options) {} /// \see Transform::run(). - virtual int apply(FileOverrides &InputStates, + virtual int apply(const FileOverrides &InputStates, const clang::tooling::CompilationDatabase &Database, const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp index 47c070e55ae..134318ed386 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp @@ -95,6 +95,7 @@ void AddOverrideFixer::run(const MatchFinder::MatchResult &Result) { if (!MacroName.empty()) ReplacementText = (" " + MacroName).str(); } - Replace.insert(tooling::Replacement(SM, StartLoc, 0, ReplacementText)); + Owner.addReplacementForCurrentTU( + tooling::Replacement(SM, StartLoc, 0, ReplacementText)); ++AcceptedChanges; } diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h index 54877d538a4..afcebeffd4b 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h @@ -25,11 +25,10 @@ class Transform; /// class AddOverrideFixer : public clang::ast_matchers::MatchFinder::MatchCallback { public: - AddOverrideFixer(clang::tooling::Replacements &Replace, - unsigned &AcceptedChanges, bool DetectMacros, - const Transform &Owner) - : Replace(Replace), AcceptedChanges(AcceptedChanges), - DetectMacros(DetectMacros), Owner(Owner) {} + AddOverrideFixer(unsigned &AcceptedChanges, bool DetectMacros, + Transform &Owner) + : AcceptedChanges(AcceptedChanges), DetectMacros(DetectMacros), + Owner(Owner) {} /// \brief Entry point to the callback called when matches are made. virtual void run(const clang::ast_matchers::MatchFinder::MatchResult &Result); @@ -38,10 +37,9 @@ public: private: clang::Preprocessor *PP; - clang::tooling::Replacements &Replace; unsigned &AcceptedChanges; bool DetectMacros; - const Transform &Owner; + Transform &Owner; }; #endif // CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H |
