diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGeneratorExpressionDAGChecker.h | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
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/cmGeneratorExpressionDAGChecker.h')
-rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.h | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h index c6c8901..28ca824 100644 --- a/Source/cmGeneratorExpressionDAGChecker.h +++ b/Source/cmGeneratorExpressionDAGChecker.h @@ -20,37 +20,38 @@ #define CM_SELECT_FIRST(F, A1, A2) F(A1) #define CM_SELECT_SECOND(F, A1, A2) F(A2) -#define CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, SELECT) \ - SELECT(F, EvaluatingIncludeDirectories, INCLUDE_DIRECTORIES) \ - SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES) \ - SELECT(F, EvaluatingCompileDefinitions, COMPILE_DEFINITIONS) \ - SELECT(F, EvaluatingCompileOptions, COMPILE_OPTIONS) \ - SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS) \ - SELECT(F, EvaluatingSources, SOURCES) \ - SELECT(F, EvaluatingCompileFeatures, COMPILE_FEATURES) - -#define CM_FOR_EACH_TRANSITIVE_PROPERTY(F) \ +#define CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, SELECT) \ + SELECT(F, EvaluatingIncludeDirectories, INCLUDE_DIRECTORIES) \ + SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES) \ + SELECT(F, EvaluatingCompileDefinitions, COMPILE_DEFINITIONS) \ + SELECT(F, EvaluatingCompileOptions, COMPILE_OPTIONS) \ + SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS) \ + SELECT(F, EvaluatingSources, SOURCES) \ + SELECT(F, EvaluatingCompileFeatures, COMPILE_FEATURES) + +#define CM_FOR_EACH_TRANSITIVE_PROPERTY(F) \ CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_BOTH) -#define CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(F) \ +#define CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(F) \ CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_FIRST) -#define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \ +#define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \ CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_SECOND) struct cmGeneratorExpressionDAGChecker { - cmGeneratorExpressionDAGChecker(const cmListFileBacktrace &backtrace, - const std::string &target, - const std::string &property, - const GeneratorExpressionContent *content, - cmGeneratorExpressionDAGChecker *parent); - cmGeneratorExpressionDAGChecker(const std::string &target, - const std::string &property, - const GeneratorExpressionContent *content, - cmGeneratorExpressionDAGChecker *parent); - - enum Result { + cmGeneratorExpressionDAGChecker(const cmListFileBacktrace& backtrace, + const std::string& target, + const std::string& property, + const GeneratorExpressionContent* content, + cmGeneratorExpressionDAGChecker* parent); + cmGeneratorExpressionDAGChecker(const std::string& target, + const std::string& property, + const GeneratorExpressionContent* content, + cmGeneratorExpressionDAGChecker* parent); + + enum Result + { DAG, SELF_REFERENCE, CYCLIC_REFERENCE, @@ -59,21 +60,19 @@ struct cmGeneratorExpressionDAGChecker Result Check() const; - void ReportError(cmGeneratorExpressionContext *context, - const std::string &expr); + void ReportError(cmGeneratorExpressionContext* context, + const std::string& expr); - bool EvaluatingLinkLibraries(const char *tgt = 0); + bool EvaluatingLinkLibraries(const char* tgt = 0); -#define DECLARE_TRANSITIVE_PROPERTY_METHOD(METHOD) \ - bool METHOD () const; +#define DECLARE_TRANSITIVE_PROPERTY_METHOD(METHOD) bool METHOD() const; CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(DECLARE_TRANSITIVE_PROPERTY_METHOD) #undef DECLARE_TRANSITIVE_PROPERTY_METHOD bool GetTransitivePropertiesOnly(); - void SetTransitivePropertiesOnly() - { this->TransitivePropertiesOnly = true; } + void SetTransitivePropertiesOnly() { this->TransitivePropertiesOnly = true; } std::string TopTarget() const; @@ -82,11 +81,11 @@ private: void Initialize(); private: - const cmGeneratorExpressionDAGChecker * const Parent; + const cmGeneratorExpressionDAGChecker* const Parent; const std::string Target; const std::string Property; std::map<std::string, std::set<std::string> > Seen; - const GeneratorExpressionContent * const Content; + const GeneratorExpressionContent* const Content; const cmListFileBacktrace Backtrace; Result CheckResult; bool TransitivePropertiesOnly; |