Author: labath Date: Thu May 2 01:52:06 2019 New Revision: 359765 URL: http://llvm.org/viewvc/llvm-project?rev=359765&view=rev Log: Fix MSVC build
Address an ambiguity between lldb_private::Thread and llvm::minidump::Thread. Follow-up to llvm r359762 (which introduced the second type). Modified: lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp Modified: lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp?rev=359765&r1=359764&r2=359765&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp (original) +++ lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp Thu May 2 01:52:06 2019 @@ -463,7 +463,7 @@ static RegisterSet g_reg_sets[] = { constexpr size_t k_num_reg_sets = llvm::array_lengthof(g_reg_sets); RegisterContextMinidump_ARM::RegisterContextMinidump_ARM( - Thread &thread, const DataExtractor &data, bool apple) + lldb_private::Thread &thread, const DataExtractor &data, bool apple) : RegisterContext(thread, 0), m_apple(apple) { lldb::offset_t offset = 0; m_regs.context_flags = data.GetU32(&offset); Modified: lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp?rev=359765&r1=359764&r2=359765&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp (original) +++ lldb/trunk/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp Thu May 2 01:52:06 2019 @@ -769,7 +769,7 @@ static RegisterSet g_reg_sets[] = { constexpr size_t k_num_reg_sets = llvm::array_lengthof(g_reg_sets); RegisterContextMinidump_ARM64::RegisterContextMinidump_ARM64( - Thread &thread, const DataExtractor &data) + lldb_private::Thread &thread, const DataExtractor &data) : RegisterContext(thread, 0) { lldb::offset_t offset = 0; m_regs.context_flags = data.GetU64(&offset); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits