From 5f9d15504efa5e1751555f25aefc00eaf4f11b89 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Sun, 28 Apr 2013 18:19:33 -0400 Subject: [PATCH] ArrayRef-izing ActOnForwardProtocolDeclaration - No functionality changes intended --- include/clang/Sema/Sema.h | 3 +-- lib/Parse/ParseObjc.cpp | 5 ++--- lib/Sema/SemaDeclObjC.cpp | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index b1b7df2..0b5d3e2 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -6297,8 +6297,7 @@ public: unsigned NumElts); DeclGroupPtrTy ActOnForwardProtocolDeclaration(SourceLocation AtProtoclLoc, - const IdentifierLocPair *IdentList, - unsigned NumElts, + const ArrayRef IdentList, AttributeList *attrList); void FindProtocolDeclaration(bool WarnOnDeclarations, diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index aa9c05e..d1b2940 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -1425,7 +1425,7 @@ Parser::ParseObjCAtProtocolDeclaration(SourceLocation AtLoc, if (Tok.is(tok::semi)) { // forward declaration of one protocol. IdentifierLocPair ProtoInfo(protocolName, nameLoc); ConsumeToken(); - return Actions.ActOnForwardProtocolDeclaration(AtLoc, &ProtoInfo, 1, + return Actions.ActOnForwardProtocolDeclaration(AtLoc, ProtoInfo, attrs.getList()); } @@ -1455,8 +1455,7 @@ Parser::ParseObjCAtProtocolDeclaration(SourceLocation AtLoc, return DeclGroupPtrTy(); return Actions.ActOnForwardProtocolDeclaration(AtLoc, - &ProtocolRefs[0], - ProtocolRefs.size(), + ProtocolRefs[0], attrs.getList()); } diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 41f9683..bedecbc 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -794,11 +794,10 @@ void Sema::DiagnoseClassExtensionDupMethods(ObjCCategoryDecl *CAT, /// ActOnForwardProtocolDeclaration - Handle \@protocol foo; Sema::DeclGroupPtrTy Sema::ActOnForwardProtocolDeclaration(SourceLocation AtProtocolLoc, - const IdentifierLocPair *IdentList, - unsigned NumElts, + const ArrayRef IdentList, AttributeList *attrList) { SmallVector DeclsInGroup; - for (unsigned i = 0; i != NumElts; ++i) { + for (unsigned i = 0; i != IdentList.size(); ++i) { IdentifierInfo *Ident = IdentList[i].first; ObjCProtocolDecl *PrevDecl = LookupProtocol(Ident, IdentList[i].second, ForRedeclaration); -- 1.7.9.5