Author: Saleem Abdulrasool Date: 2019-12-07T11:23:25-08:00 New Revision: 4ec7bb42aa67b8a03a9be497dd44195990c3ac74
URL: https://github.com/llvm/llvm-project/commit/4ec7bb42aa67b8a03a9be497dd44195990c3ac74 DIFF: https://github.com/llvm/llvm-project/commit/4ec7bb42aa67b8a03a9be497dd44195990c3ac74.diff LOG: Symbol: use elaborated types for `DataExtractor` Use type elaborated spellings for the parameter to avoid the ambiguity between `llvm` and `lldb_private` names. This is needed for building with Visual Studio. Added: Modified: lldb/source/Symbol/ClangASTContext.cpp Removed: ################################################################################ diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index e6435a261174..cf7f2caa51d2 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -8924,7 +8924,7 @@ void ClangASTContext::DumpFromSymbolFile(Stream &s, void ClangASTContext::DumpValue( lldb::opaque_compiler_type_t type, ExecutionContext *exe_ctx, Stream *s, - lldb::Format format, const DataExtractor &data, + lldb::Format format, const lldb_private::DataExtractor &data, lldb::offset_t data_byte_offset, size_t data_byte_size, uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset, bool show_types, bool show_summary, bool verbose, uint32_t depth) { @@ -9381,8 +9381,8 @@ static bool DumpEnumValue(const clang::QualType &qual_type, Stream *s, bool ClangASTContext::DumpTypeValue( lldb::opaque_compiler_type_t type, Stream *s, lldb::Format format, - const DataExtractor &data, lldb::offset_t byte_offset, size_t byte_size, - uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset, + const lldb_private::DataExtractor &data, lldb::offset_t byte_offset, + size_t byte_size, uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset, ExecutionContextScope *exe_scope) { if (!type) return false; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits