Changed the Decl::Kind enum of the ObjCPropertyDecl class, so that it follows

the pattern of the other Decl classes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49399 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index a78d04476a93d2d4215c47dde65e06f97fb8f283..d1b48b8a62160d028c3c02006d823f8d8558dade 100644 (file)
--- 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 a1e0f256fc74c2701757d4c6803dfde0aac4e857..e9d03a1769c14851103a7a4a60c462bb9653e0ec 100644 (file)
--- 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 8228eceebf6dc401ba6cdf9b73d519ae79cb5ede..afe4fcd37f13e9d7a97ec63829b8549ca3c3ffd7 100644 (file)
--- 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;
   }