replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed Protocol as TheProtocol so people can use clang header for 

building obj-c++ clients. "Protocol" is a class name in Cocoa.h

llvm-svn: 73854
This commit is contained in:
Fariborz Jahanian 2009-06-21 18:26:03 +00:00
parent 540c009fbe
commit 99b57fb987
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/AST/ExprObjC.h
View File

@ -138,20 +138,20 @@ public:
/// obj conformsToProtocol:@protocol(foo)] /// obj conformsToProtocol:@protocol(foo)]
/// The return type is "Protocol*". /// The return type is "Protocol*".
class ObjCProtocolExpr : public Expr { class ObjCProtocolExpr : public Expr {
ObjCProtocolDecl *Protocol; ObjCProtocolDecl *TheProtocol;
SourceLocation AtLoc, RParenLoc; SourceLocation AtLoc, RParenLoc;
public: public:
ObjCProtocolExpr(QualType T, ObjCProtocolDecl *protocol, ObjCProtocolExpr(QualType T, ObjCProtocolDecl *protocol,
SourceLocation at, SourceLocation rp) SourceLocation at, SourceLocation rp)
: Expr(ObjCProtocolExprClass, T), Protocol(protocol), : Expr(ObjCProtocolExprClass, T), TheProtocol(protocol),
AtLoc(at), RParenLoc(rp) {} AtLoc(at), RParenLoc(rp) {}
explicit ObjCProtocolExpr(EmptyShell Empty) explicit ObjCProtocolExpr(EmptyShell Empty)
: Expr(ObjCProtocolExprClass, Empty) {} : Expr(ObjCProtocolExprClass, Empty) {}
ObjCProtocolExpr *Clone(ASTContext &C) const; ObjCProtocolExpr *Clone(ASTContext &C) const;
ObjCProtocolDecl *getProtocol() const { return Protocol; } ObjCProtocolDecl *getProtocol() const { return TheProtocol; }
void setProtocol(ObjCProtocolDecl *P) { Protocol = P; } void setProtocol(ObjCProtocolDecl *P) { TheProtocol = P; }
SourceLocation getAtLoc() const { return AtLoc; } SourceLocation getAtLoc() const { return AtLoc; }
SourceLocation getRParenLoc() const { return RParenLoc; } SourceLocation getRParenLoc() const { return RParenLoc; }

2
clang/lib/AST/Expr.cpp
View File

@ -1571,7 +1571,7 @@ ObjCSelectorExpr *ObjCSelectorExpr::Clone(ASTContext &C) const {
} }
ObjCProtocolExpr *ObjCProtocolExpr::Clone(ASTContext &C) const { ObjCProtocolExpr *ObjCProtocolExpr::Clone(ASTContext &C) const {
return new (C) ObjCProtocolExpr(getType(), Protocol, AtLoc, RParenLoc); return new (C) ObjCProtocolExpr(getType(), TheProtocol, AtLoc, RParenLoc);
} }
// constructor for class messages. // constructor for class messages.