diff options
author | David Blaikie <dblaikie@gmail.com> | 2013-07-17 18:29:58 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2013-07-17 18:29:58 +0000 |
commit | 301fe5f69b0442769ca2a6cc9f554d316e3c595d (patch) | |
tree | 328d26747d566d7672f085f7533c20bda43ac1f8 | |
parent | 8bf1f08a2cea3d28e173555c11bfab59dd16b231 (diff) | |
download | bcm5719-llvm-301fe5f69b0442769ca2a6cc9f554d316e3c595d.tar.gz bcm5719-llvm-301fe5f69b0442769ca2a6cc9f554d316e3c595d.zip |
Constify Replacements parameter to applyAllReplacements.
http://llvm-reviews.chandlerc.com/D1169
Patch by Guillaume Papin.
llvm-svn: 186526
-rw-r--r-- | clang/include/clang/Tooling/Refactoring.h | 4 | ||||
-rw-r--r-- | clang/lib/Tooling/Refactoring.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/clang/include/clang/Tooling/Refactoring.h b/clang/include/clang/Tooling/Refactoring.h index d1a9e1edd08..0eaef95d37b 100644 --- a/clang/include/clang/Tooling/Refactoring.h +++ b/clang/include/clang/Tooling/Refactoring.h @@ -124,13 +124,13 @@ typedef std::set<Replacement, Replacement::Less> Replacements; /// 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. diff --git a/clang/lib/Tooling/Refactoring.cpp b/clang/lib/Tooling/Refactoring.cpp index 843e4bb1924..a61bf9aa34c 100644 --- a/clang/lib/Tooling/Refactoring.cpp +++ b/clang/lib/Tooling/Refactoring.cpp @@ -123,7 +123,7 @@ void Replacement::setFromSourceRange(SourceManager &Sources, 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 &Replaces, Rewriter &Rewrite) { 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(StringRef Code, Replacements &Replaces) { 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)) |