This revision was automatically updated to reflect the committed changes. Closed by commit rL257759: Fix ambiguous resolution of clang::ArrayType/llvm::ArrayType in ClangAstContext (authored by EwanCrawford).
Changed prior to commit: http://reviews.llvm.org/D16155?vs=44788&id=44854#toc Repository: rL LLVM http://reviews.llvm.org/D16155 Files: lldb/trunk/source/Symbol/ClangASTContext.cpp Index: lldb/trunk/source/Symbol/ClangASTContext.cpp =================================================================== --- lldb/trunk/source/Symbol/ClangASTContext.cpp +++ lldb/trunk/source/Symbol/ClangASTContext.cpp @@ -2105,14 +2105,14 @@ 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)); } }
Index: lldb/trunk/source/Symbol/ClangASTContext.cpp =================================================================== --- lldb/trunk/source/Symbol/ClangASTContext.cpp +++ lldb/trunk/source/Symbol/ClangASTContext.cpp @@ -2105,14 +2105,14 @@ 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