diff options
Diffstat (limited to 'clang/lib/Sema/Sema.h')
| -rw-r--r-- | clang/lib/Sema/Sema.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index 1bed03c1fca..68a834c6b4c 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -662,9 +662,15 @@ public: void DiagnosePropertyMismatch(ObjCPropertyDecl *Property, ObjCPropertyDecl *SuperProperty, - ObjCInterfaceDecl*SuperIDecl); + const char *Name); void ComparePropertiesInBaseAndSuper(ObjCInterfaceDecl *IDecl); + void MergeProtocolPropertiesIntoClass(ObjCInterfaceDecl *IDecl, + DeclTy *MergeProtocols); + + void MergeOneProtocolPropertiesIntoClass(ObjCInterfaceDecl *IDecl, + ObjCProtocolDecl *PDecl); + virtual void ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl, DeclTy **allMethods = 0, unsigned allNum = 0, DeclTy **allProperties = 0, unsigned pNum = 0); |
