diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-31 16:13:41 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-31 11:14:21 -0500 |
| commit | dc9f4f9eca3ee046bbb2f974ab9ae9af7ffc46cf (patch) | |
| tree | 692c87ee7b1ba11317dc29dbfced92a349820a9f | |
| parent | fb823855158855b6c967ef8dc7947762c097f914 (diff) | |
| parent | 3f9822ff6d2e38ef9aedc54d654e3afc635596fd (diff) | |
| download | cmake-dc9f4f9eca3ee046bbb2f974ab9ae9af7ffc46cf.tar.gz | |
Merge topic 'tidy-use-equals-default-fix'
3f9822ff6d clang-tidy: Silence use-equals-default warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2887
| -rw-r--r-- | .clang-tidy | 2 | ||||
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.clang-tidy b/.clang-tidy index 470add6350..520b1a9e39 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -33,4 +33,6 @@ HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$' CheckOptions: - key: modernize-use-default-member-init.UseAssignment value: '1' + - key: modernize-use-equals-default.IgnoreMacros + value: '0' ... diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index eb66ed5546..aac188e2d7 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -95,7 +95,7 @@ static const struct ZeroNode installInterfaceNode; #define BOOLEAN_OP_NODE(OPNAME, OP, SUCCESS_VALUE, FAILURE_VALUE) \ static const struct OP##Node : public cmGeneratorExpressionNode \ { \ - OP##Node() {} \ + OP##Node() {} /* NOLINT(modernize-use-equals-default) */ \ virtual int NumExpectedParameters() const { return OneOrMoreParameters; } \ \ std::string Evaluate(const std::vector<std::string>& parameters, \ |