Author: ewancrawford Date: Thu Jan 14 06:18:09 2016 New Revision: 257759 URL: http://llvm.org/viewvc/llvm-project?rev=257759&view=rev Log: Fix ambiguous resolution of clang::ArrayType/llvm::ArrayType in ClangAstContext
Both llvm and clang have an ArrayType class, which can cause resolution to fail when llvm headers that are implicitly included name this type. source/Symbol/ClangASTContext.cpp has 'using namespace llvm;' and 'using namespace clang;' Author: Luke Drummond <luke.drumm...@codeplay.com> Differential Revision: http://reviews.llvm.org/D16155 Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=257759&r1=257758&r2=257759&view=diff ============================================================================== --- lldb/trunk/source/Symbol/ClangASTContext.cpp (original) +++ lldb/trunk/source/Symbol/ClangASTContext.cpp Thu Jan 14 06:18:09 2016 @@ -2105,14 +2105,14 @@ ClangASTContext::CreateArrayType (const if (element_count == 0) { return CompilerType (ast, ast->getIncompleteArrayType (GetQualType(element_type), - ArrayType::Normal, + clang::ArrayType::Normal, 0)); } else { return CompilerType (ast, ast->getConstantArrayType (GetQualType(element_type), ap_element_count, - ArrayType::Normal, + clang::ArrayType::Normal, 0)); } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
