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.drummond@codeplay.com> Differential Revision: http://reviews.llvm.org/D16155 llvm-svn: 257759
This commit is contained in:
parent
9f5fde7081
commit
d0d85d22f8
|
@ -2105,14 +2105,14 @@ ClangASTContext::CreateArrayType (const CompilerType &element_type,
|
||||||
if (element_count == 0)
|
if (element_count == 0)
|
||||||
{
|
{
|
||||||
return CompilerType (ast, ast->getIncompleteArrayType (GetQualType(element_type),
|
return CompilerType (ast, ast->getIncompleteArrayType (GetQualType(element_type),
|
||||||
ArrayType::Normal,
|
clang::ArrayType::Normal,
|
||||||
0));
|
0));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return CompilerType (ast, ast->getConstantArrayType (GetQualType(element_type),
|
return CompilerType (ast, ast->getConstantArrayType (GetQualType(element_type),
|
||||||
ap_element_count,
|
ap_element_count,
|
||||||
ArrayType::Normal,
|
clang::ArrayType::Normal,
|
||||||
0));
|
0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue