From d0d85d22f877efb232cce509a044d54ae9874bbe Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Thu, 14 Jan 2016 12:18:09 +0000 Subject: [PATCH] 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 Differential Revision: http://reviews.llvm.org/D16155 llvm-svn: 257759 --- lldb/source/Symbol/ClangASTContext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 621bd1615f80..2086ca77bff7 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -2105,14 +2105,14 @@ ClangASTContext::CreateArrayType (const CompilerType &element_type, 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)); } }