forked from OSchip/llvm-project
[Sema] Remove unnecessary typecast of bool to int when passing arguments to diagnostics. NFC
llvm-svn: 253316
This commit is contained in:
parent
da7b27ff0b
commit
e39fa490f9
|
@ -4160,7 +4160,7 @@ Decl *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS,
|
|||
assert(FD->getAccess() != AS_none);
|
||||
if (FD->getAccess() != AS_public) {
|
||||
Diag(FD->getLocation(), diag::err_anonymous_record_nonpublic_member)
|
||||
<< (int)Record->isUnion() << (int)(FD->getAccess() == AS_protected);
|
||||
<< Record->isUnion() << (FD->getAccess() == AS_protected);
|
||||
Invalid = true;
|
||||
}
|
||||
|
||||
|
@ -4184,11 +4184,11 @@ Decl *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS,
|
|||
// Visual C++ allows type definition in anonymous struct or union.
|
||||
if (getLangOpts().MicrosoftExt)
|
||||
Diag(MemRecord->getLocation(), diag::ext_anonymous_record_with_type)
|
||||
<< (int)Record->isUnion();
|
||||
<< Record->isUnion();
|
||||
else {
|
||||
// This is a nested type declaration.
|
||||
Diag(MemRecord->getLocation(), diag::err_anonymous_record_with_type)
|
||||
<< (int)Record->isUnion();
|
||||
<< Record->isUnion();
|
||||
Invalid = true;
|
||||
}
|
||||
} else {
|
||||
|
@ -4197,7 +4197,7 @@ Decl *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS,
|
|||
// not part of standard C++.
|
||||
Diag(MemRecord->getLocation(),
|
||||
diag::ext_anonymous_record_with_anonymous_type)
|
||||
<< (int)Record->isUnion();
|
||||
<< Record->isUnion();
|
||||
}
|
||||
} else if (isa<AccessSpecDecl>(Mem)) {
|
||||
// Any access specifier is fine.
|
||||
|
@ -4218,10 +4218,9 @@ Decl *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS,
|
|||
if (getLangOpts().MicrosoftExt &&
|
||||
DK == diag::err_anonymous_record_with_type)
|
||||
Diag(Mem->getLocation(), diag::ext_anonymous_record_with_type)
|
||||
<< (int)Record->isUnion();
|
||||
<< Record->isUnion();
|
||||
else {
|
||||
Diag(Mem->getLocation(), DK)
|
||||
<< (int)Record->isUnion();
|
||||
Diag(Mem->getLocation(), DK) << Record->isUnion();
|
||||
Invalid = true;
|
||||
}
|
||||
}
|
||||
|
@ -4238,7 +4237,7 @@ Decl *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS,
|
|||
|
||||
if (!Record->isUnion() && !Owner->isRecord()) {
|
||||
Diag(Record->getLocation(), diag::err_anonymous_struct_not_member)
|
||||
<< (int)getLangOpts().CPlusPlus;
|
||||
<< getLangOpts().CPlusPlus;
|
||||
Invalid = true;
|
||||
}
|
||||
|
||||
|
@ -13158,7 +13157,7 @@ bool Sema::CheckNontrivialField(FieldDecl *FD) {
|
|||
Diag(FD->getLocation(), getLangOpts().CPlusPlus11 ?
|
||||
diag::warn_cxx98_compat_nontrivial_union_or_anon_struct_member :
|
||||
diag::err_illegal_union_or_anon_struct_member)
|
||||
<< (int)FD->getParent()->isUnion() << FD->getDeclName() << member;
|
||||
<< FD->getParent()->isUnion() << FD->getDeclName() << member;
|
||||
DiagnoseNontrivial(RDecl, member);
|
||||
return !getLangOpts().CPlusPlus11;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue