forked from OSchip/llvm-project
Silence a couple more operator precedence warnings; this shouldn't
change the semantics. Please correct this if the precedence was actually supposed to be something different. llvm-svn: 61099
This commit is contained in:
parent
c8a590dda3
commit
42b1e9e252
|
@ -1052,8 +1052,8 @@ void Sema::ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl,
|
|||
const ObjCMethodDecl *&PrevMethod = InsMap[Method->getSelector()];
|
||||
bool match = PrevMethod ? MatchTwoMethodDeclarations(Method, PrevMethod)
|
||||
: false;
|
||||
if (isInterfaceDeclKind && PrevMethod && !match
|
||||
|| checkIdenticalMethods && match) {
|
||||
if ((isInterfaceDeclKind && PrevMethod && !match)
|
||||
|| (checkIdenticalMethods && match)) {
|
||||
Diag(Method->getLocation(), diag::err_duplicate_method_decl)
|
||||
<< Method->getDeclName();
|
||||
Diag(PrevMethod->getLocation(), diag::note_previous_declaration);
|
||||
|
@ -1069,8 +1069,8 @@ void Sema::ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl,
|
|||
const ObjCMethodDecl *&PrevMethod = ClsMap[Method->getSelector()];
|
||||
bool match = PrevMethod ? MatchTwoMethodDeclarations(Method, PrevMethod)
|
||||
: false;
|
||||
if (isInterfaceDeclKind && PrevMethod && !match
|
||||
|| checkIdenticalMethods && match) {
|
||||
if ((isInterfaceDeclKind && PrevMethod && !match)
|
||||
|| (checkIdenticalMethods && match)) {
|
||||
Diag(Method->getLocation(), diag::err_duplicate_method_decl)
|
||||
<< Method->getDeclName();
|
||||
Diag(PrevMethod->getLocation(), diag::note_previous_declaration);
|
||||
|
|
|
@ -538,7 +538,7 @@ bool Sema::ObjCQualifiedIdTypesAreCompatible(QualType lhs, QualType rhs,
|
|||
for (; RHSProtoI != RHSProtoE; ++RHSProtoI) {
|
||||
ObjCProtocolDecl *rhsProto = *RHSProtoI;
|
||||
if (ProtocolCompatibleWithProtocol(lhsProto, rhsProto) ||
|
||||
compare && ProtocolCompatibleWithProtocol(rhsProto, lhsProto)) {
|
||||
(compare && ProtocolCompatibleWithProtocol(rhsProto, lhsProto))) {
|
||||
match = true;
|
||||
break;
|
||||
}
|
||||
|
@ -583,7 +583,7 @@ bool Sema::ObjCQualifiedIdTypesAreCompatible(QualType lhs, QualType rhs,
|
|||
for (unsigned j = 0; j < rhsQID->getNumProtocols(); j++) {
|
||||
ObjCProtocolDecl *rhsProto = rhsQID->getProtocols(j);
|
||||
if (ProtocolCompatibleWithProtocol(lhsProto, rhsProto) ||
|
||||
compare && ProtocolCompatibleWithProtocol(rhsProto, lhsProto)) {
|
||||
(compare && ProtocolCompatibleWithProtocol(rhsProto, lhsProto))) {
|
||||
match = true;
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue