diff options
author | Zachary Turner <zturner@google.com> | 2017-10-09 18:50:29 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-10-09 18:50:29 +0000 |
commit | 514b7105b52fb98939f2b982651ec876582250f4 (patch) | |
tree | 82c677faaf33dd0040f4534c4f9b51145469b7d8 /llvm/tools/llvm-rc/ResourceScriptParser.cpp | |
parent | 4f5a3d5d6f15d8624cd78b53246d633ca54619c1 (diff) | |
download | bcm5719-llvm-514b7105b52fb98939f2b982651ec876582250f4.tar.gz bcm5719-llvm-514b7105b52fb98939f2b982651ec876582250f4.zip |
Fix some C++ value / reference semantics issues.
Some functions were taking Twine's not by const&, these are all
fixed to take by const&. We also had a case where some functions
were overloaded to accept by const& and &&. Now there is only
one version which accepts by value and move's the value.
llvm-svn: 315229
Diffstat (limited to 'llvm/tools/llvm-rc/ResourceScriptParser.cpp')
-rw-r--r-- | llvm/tools/llvm-rc/ResourceScriptParser.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/llvm/tools/llvm-rc/ResourceScriptParser.cpp b/llvm/tools/llvm-rc/ResourceScriptParser.cpp index 47f8745837e..4acae313558 100644 --- a/llvm/tools/llvm-rc/ResourceScriptParser.cpp +++ b/llvm/tools/llvm-rc/ResourceScriptParser.cpp @@ -28,7 +28,7 @@ namespace llvm { namespace rc { -RCParser::ParserError::ParserError(const Twine Expected, const LocIter CurLoc, +RCParser::ParserError::ParserError(const Twine &Expected, const LocIter CurLoc, const LocIter End) : ErrorLoc(CurLoc), FileEnd(End) { CurMessage = "Error parsing file: expected " + Expected.str() + ", got " + @@ -37,10 +37,7 @@ RCParser::ParserError::ParserError(const Twine Expected, const LocIter CurLoc, char RCParser::ParserError::ID = 0; -RCParser::RCParser(const std::vector<RCToken> &TokenList) - : Tokens(TokenList), CurLoc(Tokens.begin()), End(Tokens.end()) {} - -RCParser::RCParser(std::vector<RCToken> &&TokenList) +RCParser::RCParser(std::vector<RCToken> TokenList) : Tokens(std::move(TokenList)), CurLoc(Tokens.begin()), End(Tokens.end()) {} bool RCParser::isEof() const { return CurLoc == End; } @@ -706,7 +703,7 @@ RCParser::ParseOptionType RCParser::parseStyleStmt() { return llvm::make_unique<StyleStmt>(*Arg); } -Error RCParser::getExpectedError(const Twine Message, bool IsAlreadyRead) { +Error RCParser::getExpectedError(const Twine &Message, bool IsAlreadyRead) { return make_error<ParserError>( Message, IsAlreadyRead ? std::prev(CurLoc) : CurLoc, End); } |