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 a442503..e2ec394 100644
--- a/Sema/Sema.h
+++ b/Sema/Sema.h
@@ -89,7 +89,7 @@
/// 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 92be893..4688361 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -42,8 +42,8 @@
ObjcCategory,
ObjcCategoryImpl,
ObjcImplementation,
+ ObjcProtocol,
// ScopedDecl
- ObjcProtocol,
// TypeDecl
ObjcInterface,
Typedef,
@@ -68,7 +68,7 @@
// 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,