Update DeclKind enums to reflect ObjcProtocolDecl's inheritance change.

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

diff --git a/Sema/Sema.h b/Sema/Sema.h
index a442503b5b078c4e0732370321d2975dfa8ea7b9..e2ec394901c237358beac4069d8e35cfa7474074 100644 (file)
--- a/Sema/Sema.h
+++ b/Sema/Sema.h
@@ -89,7 +89,7 @@ class Sema : public Action {
   
   /// ObjcProtocols - Keep track of all protocol declarations declared
   /// with @protocol keyword, so that we can emit errors on duplicates and
-  /// find the declarations when needded.
+  /// find the declarations when needed.
   llvm::DenseMap<IdentifierInfo*, ObjcProtocolDecl*> ObjcProtocols;
   
   // Enum values used by KnownFunctionIDs (see below).

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 92be893f5a65e97d29314592c802ba898f2b51cd..4688361fc5e77f7bf5500aa8c5314bddfc14c21b 100644 (file)
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -42,8 +42,8 @@ public:
            ObjcCategory,
            ObjcCategoryImpl,
            ObjcImplementation,
+           ObjcProtocol,
     //     ScopedDecl
-             ObjcProtocol,
     //       TypeDecl
                ObjcInterface,
                Typedef,
@@ -68,7 +68,7 @@ public:
     // of the class, to allow efficient classof.
     NamedFirst  = Field,         NamedLast  = ParmVar,
     FieldFirst  = Field,         FieldLast  = ObjcIvar,
-    ScopedFirst = ObjcProtocol,  ScopedLast = ParmVar,
+    ScopedFirst = ObjcInterface, ScopedLast = ParmVar,
     TypeFirst   = ObjcInterface, TypeLast   = Class,
     TagFirst    = Enum         , TagLast    = Class,
     RecordFirst = Struct       , RecordLast = Class,