mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmGeneratorExpression: Use std::move to avoid vector copies

Browse Source 
Use move semantics in GeneratorExpressionContent::SetIdentifier and
::SetParameters to avoid vector copies.
This commit is contained in:
Frank Winklmeier
2018-02-20 15:38:08 +01:00
committed by Brad King
parent 31419815aa
commit 46436581c6
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGeneratorExpressionEvaluator.h
+6 -6
View File
@@ -7,6 +7,7 @@
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
#include <utility>
#include <vector> #include <vector>
struct cmGeneratorExpressionContext; struct cmGeneratorExpressionContext;
@@ -64,17 +65,16 @@ private:
struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator
{ {
GeneratorExpressionContent(const char* startContent, size_t length); GeneratorExpressionContent(const char* startContent, size_t length);
void SetIdentifier(
std::vector<cmGeneratorExpressionEvaluator*> const& identifier) void SetIdentifier(std::vector<cmGeneratorExpressionEvaluator*> identifier)
{ {
this->IdentifierChildren = identifier; this->IdentifierChildren = std::move(identifier);
} }
void SetParameters( void SetParameters(
std::vector<std::vector<cmGeneratorExpressionEvaluator*>> const& std::vector<std::vector<cmGeneratorExpressionEvaluator*>> parameters)
parameters)
{ {
this->ParamChildren = parameters; this->ParamChildren = std::move(parameters);
} }
Type GetType() const override Type GetType() const override
Source/cmGeneratorExpressionParser.cxx
+4 -3
View File
@@ -6,6 +6,7 @@
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <utility>
cmGeneratorExpressionParser::cmGeneratorExpressionParser( cmGeneratorExpressionParser::cmGeneratorExpressionParser(
const std::vector<cmGeneratorExpressionToken>& tokens) const std::vector<cmGeneratorExpressionToken>& tokens)
@@ -92,7 +93,7 @@ void cmGeneratorExpressionParser::ParseGeneratorExpression(
assert(this->it != this->Tokens.end()); assert(this->it != this->Tokens.end());
++this->it; ++this->it;
--this->NestingLevel; --this->NestingLevel;
content->SetIdentifier(identifier); content->SetIdentifier(std::move(identifier));
result.push_back(content); result.push_back(content);
return; return;
} }
@@ -198,8 +199,8 @@ void cmGeneratorExpressionParser::ParseGeneratorExpression(
((this->it - 1)->Content - startToken->Content) + (this->it - 1)->Length; ((this->it - 1)->Content - startToken->Content) + (this->it - 1)->Length;
GeneratorExpressionContent* content = GeneratorExpressionContent* content =
new GeneratorExpressionContent(startToken->Content, contentLength); new GeneratorExpressionContent(startToken->Content, contentLength);
content->SetIdentifier(identifier); content->SetIdentifier(std::move(identifier));
content->SetParameters(parameters); content->SetParameters(std::move(parameters));
result.push_back(content); result.push_back(content);
} }