diff options
Diffstat (limited to 'lib/Sema/Sema.h')
| -rw-r--r-- | lib/Sema/Sema.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index a9ad257e41..ef99aaaa46 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -1075,10 +1075,10 @@ public: const IdentifierInfo *Name); void ComparePropertiesInBaseAndSuper(ObjCInterfaceDecl *IDecl); - void MergeProtocolPropertiesIntoClass(ObjCInterfaceDecl *IDecl, + void MergeProtocolPropertiesIntoClass(Decl *CDecl, DeclTy *MergeProtocols); - void MergeOneProtocolPropertiesIntoClass(ObjCInterfaceDecl *IDecl, + void MergeOneProtocolPropertiesIntoClass(Decl *CDecl, ObjCProtocolDecl *PDecl); virtual void ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl, |