Adapt to current Clang trunk towards 3.7

Change-Id: Ibb2c641d49a1773be789c9259f53a040db6f605f
This commit is contained in:
Stephan Bergmann
2015-08-04 09:36:32 +02:00
parent f17f89aadc
commit c15b4cf39a
7 changed files with 77 additions and 12 deletions

View File

@@ -36,7 +36,13 @@ private:
std::string getFilename(SourceLocation loc);
};
bool BaseCheckNotTestFixtureSubclass(const CXXRecordDecl *BaseDefinition, void *) {
bool BaseCheckNotTestFixtureSubclass(
const CXXRecordDecl *BaseDefinition
#if __clang_major__ == 3 && __clang_minor__ < 7
, void *
#endif
)
{
if (BaseDefinition->getQualifiedNameAsString().compare("CppUnit::TestFixture") == 0) {
return false;
}
@@ -49,7 +55,7 @@ bool isDerivedFromTestFixture(const CXXRecordDecl *decl) {
if (// not sure what hasAnyDependentBases() does,
// but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
!decl->hasAnyDependentBases() &&
!decl->forallBases(BaseCheckNotTestFixtureSubclass, nullptr, true)) {
!compat::forallBases(*decl, BaseCheckNotTestFixtureSubclass, true)) {
return true;
}
return false;