Author: dblaikie Date: Wed Jul 17 13:29:58 2013 New Revision: 186526 URL: http://llvm.org/viewvc/llvm-project?rev=186526&view=rev Log: Constify Replacements parameter to applyAllReplacements.
http://llvm-reviews.chandlerc.com/D1169 Patch by Guillaume Papin. Modified: cfe/trunk/include/clang/Tooling/Refactoring.h cfe/trunk/lib/Tooling/Refactoring.cpp Modified: cfe/trunk/include/clang/Tooling/Refactoring.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Refactoring.h?rev=186526&r1=186525&r2=186526&view=diff ============================================================================== --- cfe/trunk/include/clang/Tooling/Refactoring.h (original) +++ cfe/trunk/include/clang/Tooling/Refactoring.h Wed Jul 17 13:29:58 2013 @@ -124,13 +124,13 @@ typedef std::set<Replacement, Replacemen /// other applications. /// /// \returns true if all replacements apply. false otherwise. -bool applyAllReplacements(Replacements &Replaces, Rewriter &Rewrite); +bool applyAllReplacements(const Replacements &Replaces, Rewriter &Rewrite); /// \brief Applies all replacements in \p Replaces to \p Code. /// /// This completely ignores the path stored in each replacement. If one or more /// replacements cannot be applied, this returns an empty \c string. -std::string applyAllReplacements(StringRef Code, Replacements &Replaces); +std::string applyAllReplacements(StringRef Code, const Replacements &Replaces); /// \brief Calculates how a code \p Position is shifted when \p Replaces are /// applied. Modified: cfe/trunk/lib/Tooling/Refactoring.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Refactoring.cpp?rev=186526&r1=186525&r2=186526&view=diff ============================================================================== --- cfe/trunk/lib/Tooling/Refactoring.cpp (original) +++ cfe/trunk/lib/Tooling/Refactoring.cpp Wed Jul 17 13:29:58 2013 @@ -123,7 +123,7 @@ void Replacement::setFromSourceRange(Sou getRangeSize(Sources, Range), ReplacementText); } -bool applyAllReplacements(Replacements &Replaces, Rewriter &Rewrite) { +bool applyAllReplacements(const Replacements &Replaces, Rewriter &Rewrite) { bool Result = true; for (Replacements::const_iterator I = Replaces.begin(), E = Replaces.end(); @@ -137,7 +137,7 @@ bool applyAllReplacements(Replacements & return Result; } -std::string applyAllReplacements(StringRef Code, Replacements &Replaces) { +std::string applyAllReplacements(StringRef Code, const Replacements &Replaces) { FileManager Files((FileSystemOptions())); DiagnosticsEngine Diagnostics( IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), @@ -152,8 +152,8 @@ std::string applyAllReplacements(StringR SourceMgr.overrideFileContents(Entry, Buf); FileID ID = SourceMgr.createFileID(Entry, SourceLocation(), clang::SrcMgr::C_User); - for (Replacements::iterator I = Replaces.begin(), E = Replaces.end(); I != E; - ++I) { + for (Replacements::const_iterator I = Replaces.begin(), E = Replaces.end(); + I != E; ++I) { Replacement Replace("<stdin>", I->getOffset(), I->getLength(), I->getReplacementText()); if (!Replace.apply(Rewrite)) _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
