From 3f9822ff6d2e38ef9aedc54d654e3afc635596fd Mon Sep 17 00:00:00 2001 From: Regina Pfeifer Date: Wed, 30 Jan 2019 17:51:07 +0100 Subject: clang-tidy: Silence use-equals-default warning clang-tidy 7 has an option to suppress this warning in macros which defaults to '1'. Set the option to '0' and silence the warning explicitly. --- .clang-tidy | 2 ++ Source/cmGeneratorExpressionNode.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index dace6f1781..a41ab648eb 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -34,4 +34,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& parameters, \ -- cgit v1.2.1