From 39f9f726bcc27f8f125cc8078d33f818b2d54eee Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 23 May 2014 08:52:10 +0000 Subject: [PATCH] clang-tidy: Only add 'override' before inlined bodies. llvm-svn: 209505 --- clang-tools-extra/clang-tidy/misc/UseOverride.cpp | 3 ++- clang-tools-extra/test/clang-tidy/use-override.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clang-tools-extra/clang-tidy/misc/UseOverride.cpp b/clang-tools-extra/clang-tidy/misc/UseOverride.cpp index c8974da..628c20f 100644 --- a/clang-tools-extra/clang-tidy/misc/UseOverride.cpp +++ b/clang-tools-extra/clang-tidy/misc/UseOverride.cpp @@ -96,7 +96,8 @@ void UseOverride::check(const MatchFinder::MatchResult &Result) { } } - if (InsertLoc.isInvalid() && Method->getBody()) { + if (InsertLoc.isInvalid() && Method->doesThisDeclarationHaveABody() && + Method->getBody()) { InsertLoc = Method->getBody()->getLocStart(); } diff --git a/clang-tools-extra/test/clang-tidy/use-override.cpp b/clang-tools-extra/test/clang-tidy/use-override.cpp index df0ab24..25c5a6a 100644 --- a/clang-tools-extra/test/clang-tidy/use-override.cpp +++ b/clang-tools-extra/test/clang-tidy/use-override.cpp @@ -59,6 +59,9 @@ public: void SimpleCases::i() {} // CHECK: {{^void SimpleCases::i\(\) {}}} +SimpleCases::~SimpleCases() {} +// CHECK: {{^SimpleCases::~SimpleCases\(\) {}}} + struct InlineDefinitions : public Base { public: virtual ~InlineDefinitions() {} -- 2.7.4