strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make configmgr loplugin:salbool-clean

Browse source 
Change-Id: Ib1f33387c50bcd853140eb2fc46995d23d7f367b
This commit is contained in:
Stephan Bergmann 2014-07-02 18:48:18 +02:00
parent 3325e0f206
commit 0e8d69fa7d
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
compilerplugins/clang/salbool.cxx
View file

@ -70,23 +70,19 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) {
//TODO: current implementation is not at all general, just tests what we
// encounter in practice:
bool hasBoolOverload(FunctionDecl const * decl) {
if (isa<CXXMethodDecl>(decl)) {
unsigned n = decl->getNumParams();
CXXRecordDecl const * r = dyn_cast<CXXRecordDecl>(
decl->getDeclContext());
assert(r != nullptr);
for (auto m = r->method_begin(); m != r->method_end(); ++m) {
if (m->getDeclName() == decl->getDeclName()
&& m->getNumParams() == n)
{
bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) {
unsigned n = decl->getNumParams();
for (auto d: decl->getDeclContext()->lookup(decl->getDeclName())) {
FunctionDecl const * f = dyn_cast<FunctionDecl>(d);
if (f != nullptr && (!mustBeDeleted || f->isDeleted())) {
if (f->getNumParams() == n) {
bool hasSB = false;
for (unsigned i = 0; i != n; ++i) {
QualType t1 { decl->getParamDecl(i)->getType() };
bool isSB = isSalBool(t1);
bool isSBRef = !isSB && t1->isReferenceType()
&& isSalBool(t1.getNonReferenceType());
QualType t2 { m->getParamDecl(i)->getType() };
QualType t2 { f->getParamDecl(i)->getType() };
if (!(isSB
? t2->isBooleanType()
: isSBRef
@ -286,8 +282,8 @@ bool SalBool::VisitParmVarDecl(ParmVarDecl const * decl) {
f->getNameInfo().getLoc()))
&& (!f->isInlined() || f->hasAttr<DeprecatedAttr>()
|| decl->getType()->isReferenceType()
|| hasBoolOverload(f)))
|| f->isDeleted()))
|| hasBoolOverload(f, false)))
|| f->isDeleted() || hasBoolOverload(f, true)))
{
OverrideKind k = getOverrideKind(f);
if (k != OverrideKind::YES) {

2
configmgr/source/writemodfile.cxx
View file

@ -113,6 +113,8 @@ void writeData_(oslFileHandle handle, char const * begin, sal_Int32 length) {
}
}
void writeValueContent_(oslFileHandle, bool) SAL_DELETED_FUNCTION;
// silence lopluign:salbool
void writeValueContent_(oslFileHandle handle, sal_Bool value) {
if (value) {
writeData_(handle, RTL_CONSTASCII_STRINGPARAM("true"));