aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/AST/DeclBase.h2
-rw-r--r--include/clang/AST/DeclObjC.h4
-rw-r--r--lib/AST/Decl.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index a78d04476a..d1b48b8a62 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -42,7 +42,7 @@ public:
ObjCCategoryImpl,
ObjCImplementation,
ObjCProtocol,
- PropertyDecl,
+ ObjCProperty,
// ScopedDecl
// TypeDecl
Typedef,
diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index a1e0f256fc..e9d03a1769 100644
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -952,7 +952,7 @@ private:
IdentifierInfo *SetterName; // setter name of NULL if no setter
ObjCPropertyDecl(SourceLocation L)
- : Decl(PropertyDecl, L), PropertyDecls(0), NumPropertyDecls(0),
+ : Decl(ObjCProperty, L), PropertyDecls(0), NumPropertyDecls(0),
PropertyAttributes(OBJC_PR_noattr), GetterName(0), SetterName(0) {}
public:
static ObjCPropertyDecl *Create(ASTContext &C, SourceLocation L);
@@ -983,7 +983,7 @@ public:
void setSetterName(IdentifierInfo *Id) { SetterName = Id; }
static bool classof(const Decl *D) {
- return D->getKind() == PropertyDecl;
+ return D->getKind() == ObjCProperty;
}
static bool classof(const ObjCPropertyDecl *D) { return true; }
};
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 8228eceebf..afe4fcd37f 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -194,7 +194,7 @@ void Decl::addDeclKind(Kind k) {
case ObjCImplementation: nObjCImplementationDecls++; break;
case ObjCCategoryImpl: nObjCCategoryImpl++; break;
case ObjCCompatibleAlias: nObjCCompatibleAlias++; break;
- case PropertyDecl: nObjCPropertyDecl++; break;
+ case ObjCProperty: nObjCPropertyDecl++; break;
case LinkageSpec: nLinkageSpecDecl++; break;
case FileScopeAsm: nFileScopeAsmDecl++; break;
}