Author: chandlerc Date: Fri Feb 20 22:31:13 2015 New Revision: 230126 URL: http://llvm.org/viewvc/llvm-project?rev=230126&view=rev Log: Update for Clang API change in r230123 -- lookup_result was always const, there was never a need for lookup_const_result. Now that vestigal type is gone, so switch LLDB to lookup_result and to use the DeclContextLookupResult rather than the Const variant.
Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h lldb/trunk/include/lldb/Symbol/ClangASTContext.h lldb/trunk/source/Expression/ClangASTSource.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=230126&r1=230125&r2=230126&view=diff ============================================================================== --- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original) +++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Fri Feb 20 22:31:13 2015 @@ -513,7 +513,7 @@ struct NameSearchContext { /// The DeclContextLookupResult, usually returned as the result /// of querying a DeclContext. //------------------------------------------------------------------ - void AddLookupResult (clang::DeclContextLookupConstResult result); + void AddLookupResult (clang::DeclContextLookupResult result); //------------------------------------------------------------------ /// Add a NamedDecl to the list of results. Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=230126&r1=230125&r2=230126&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original) +++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Fri Feb 20 22:31:13 2015 @@ -235,7 +235,7 @@ public: clang::IdentifierInfo &myIdent = ast->Idents.get(type_name.GetCString()); clang::DeclarationName myName = ast->DeclarationNames.getIdentifier(&myIdent); - clang::DeclContext::lookup_const_result result = ast->getTranslationUnitDecl()->lookup(myName); + clang::DeclContext::lookup_result result = ast->getTranslationUnitDecl()->lookup(myName); if (!result.empty()) { Modified: lldb/trunk/source/Expression/ClangASTSource.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=230126&r1=230125&r2=230126&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangASTSource.cpp (original) +++ lldb/trunk/source/Expression/ClangASTSource.cpp Fri Feb 20 22:31:13 2015 @@ -2008,7 +2008,7 @@ NameSearchContext::AddTypeDecl(const Cla } void -NameSearchContext::AddLookupResult (clang::DeclContextLookupConstResult result) +NameSearchContext::AddLookupResult (clang::DeclContextLookupResult result) { for (clang::NamedDecl *decl : result) m_decls.push_back (decl); Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp?rev=230126&r1=230125&r2=230126&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp Fri Feb 20 22:31:13 2015 @@ -60,7 +60,7 @@ public: if (!m_decl_vendor.FinishDecl(non_const_interface_decl)) break; - clang::DeclContext::lookup_const_result result = non_const_interface_decl->lookup(name); + clang::DeclContext::lookup_result result = non_const_interface_decl->lookup(name); return (result.size() != 0); } @@ -588,7 +588,7 @@ AppleObjCDeclVendor::FindDecls (const Co clang::IdentifierInfo &identifier_info = ast_ctx->Idents.get(name.GetStringRef()); clang::DeclarationName decl_name = ast_ctx->DeclarationNames.getIdentifier(&identifier_info); - clang::DeclContext::lookup_const_result lookup_result = ast_ctx->getTranslationUnitDecl()->lookup(decl_name); + clang::DeclContext::lookup_result lookup_result = ast_ctx->getTranslationUnitDecl()->lookup(decl_name); if (!lookup_result.empty()) { _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits