diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGeneratorExpressionEvaluator.h | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.h')
-rw-r--r-- | Source/cmGeneratorExpressionEvaluator.h | 69 |
1 files changed, 28 insertions, 41 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index bce486b3cb..7ca62c5b66 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -35,93 +35,80 @@ struct cmGeneratorExpressionEvaluator virtual Type GetType() const = 0; - virtual std::string Evaluate(cmGeneratorExpressionContext *context, - cmGeneratorExpressionDAGChecker *) const = 0; + virtual std::string Evaluate(cmGeneratorExpressionContext* context, + cmGeneratorExpressionDAGChecker*) const = 0; private: - cmGeneratorExpressionEvaluator(const cmGeneratorExpressionEvaluator &); - void operator=(const cmGeneratorExpressionEvaluator &); + cmGeneratorExpressionEvaluator(const cmGeneratorExpressionEvaluator&); + void operator=(const cmGeneratorExpressionEvaluator&); }; struct TextContent : public cmGeneratorExpressionEvaluator { - TextContent(const char *start, size_t length) - : Content(start), Length(length) + TextContent(const char* start, size_t length) + : Content(start) + , Length(length) { - } - std::string Evaluate(cmGeneratorExpressionContext *, - cmGeneratorExpressionDAGChecker *) const + std::string Evaluate(cmGeneratorExpressionContext*, + cmGeneratorExpressionDAGChecker*) const { return std::string(this->Content, this->Length); } - Type GetType() const - { - return cmGeneratorExpressionEvaluator::Text; - } + Type GetType() const { return cmGeneratorExpressionEvaluator::Text; } - void Extend(size_t length) - { - this->Length += length; - } + void Extend(size_t length) { this->Length += length; } - size_t GetLength() - { - return this->Length; - } + size_t GetLength() { return this->Length; } private: - const char *Content; + const char* Content; size_t Length; }; struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator { - GeneratorExpressionContent(const char *startContent, size_t length); + GeneratorExpressionContent(const char* startContent, size_t length); void SetIdentifier(std::vector<cmGeneratorExpressionEvaluator*> identifier) { this->IdentifierChildren = identifier; } void SetParameters( - std::vector<std::vector<cmGeneratorExpressionEvaluator*> > parameters) + std::vector<std::vector<cmGeneratorExpressionEvaluator*> > parameters) { this->ParamChildren = parameters; } - Type GetType() const - { - return cmGeneratorExpressionEvaluator::Generator; - } + Type GetType() const { return cmGeneratorExpressionEvaluator::Generator; } - std::string Evaluate(cmGeneratorExpressionContext *context, - cmGeneratorExpressionDAGChecker *) const; + std::string Evaluate(cmGeneratorExpressionContext* context, + cmGeneratorExpressionDAGChecker*) const; std::string GetOriginalExpression() const; ~GeneratorExpressionContent(); private: - std::string EvaluateParameters(const cmGeneratorExpressionNode *node, - const std::string &identifier, - cmGeneratorExpressionContext *context, - cmGeneratorExpressionDAGChecker *dagChecker, - std::vector<std::string> ¶meters) const; + std::string EvaluateParameters(const cmGeneratorExpressionNode* node, + const std::string& identifier, + cmGeneratorExpressionContext* context, + cmGeneratorExpressionDAGChecker* dagChecker, + std::vector<std::string>& parameters) const; std::string ProcessArbitraryContent( - const cmGeneratorExpressionNode *node, - const std::string &identifier, - cmGeneratorExpressionContext *context, - cmGeneratorExpressionDAGChecker *dagChecker, + const cmGeneratorExpressionNode* node, const std::string& identifier, + cmGeneratorExpressionContext* context, + cmGeneratorExpressionDAGChecker* dagChecker, std::vector<std::vector<cmGeneratorExpressionEvaluator*> >::const_iterator - pit) const; + pit) const; private: std::vector<cmGeneratorExpressionEvaluator*> IdentifierChildren; std::vector<std::vector<cmGeneratorExpressionEvaluator*> > ParamChildren; - const char *StartContent; + const char* StartContent; size_t ContentLength; }; |