diff options
| -rw-r--r-- | lib/Sema/Sema.h | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index e30f4b2b38..a91d3da720 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -99,7 +99,8 @@ class Sema : public Action { /// with @compatibility_alias, so that we can emit errors on duplicates and /// find the declarations when needed. This construct is ancient and will /// likely never be seen. Nevertheless, it is here for compatibility. - typedef llvm::DenseMap<IdentifierInfo*, ObjCCompatibleAliasDecl*> ObjCAliasTy; + typedef llvm::DenseMap<const IdentifierInfo*, + ObjCCompatibleAliasDecl*> ObjCAliasTy; ObjCAliasTy ObjCAliasDecls; // Enum values used by KnownFunctionIDs (see below). diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 0280ef2127..c958dd1027 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -42,7 +42,7 @@ Sema::DeclTy *Sema::isTypeName(const IdentifierInfo &II, Scope *S) const { if (getLangOptions().ObjC1) { // @interface and @compatibility_alias result in new type references. // Creating a class alias is *extremely* rare. - ObjCAliasTy::const_iterator I = ObjCAliasDecls.find((IdentifierInfo*)&II); + ObjCAliasTy::const_iterator I = ObjCAliasDecls.find(&II); if (I != ObjCAliasDecls.end()) return I->second->getClassInterface(); } @@ -141,7 +141,7 @@ Decl *Sema::LookupDecl(IdentifierInfo *II, unsigned NSI, if (getLangOptions().ObjC1) { // @interface and @compatibility_alias introduce typedef-like names. // Unlike typedef's, they can only be introduced at file-scope (and are - // not therefore not scoped decls). They can, however, be shadowed by + // therefore not scoped decls). They can, however, be shadowed by // other names in IDNS_Ordinary. ObjCAliasTy::iterator I = ObjCAliasDecls.find(II); if (I != ObjCAliasDecls.end()) |