Author: amccarth
Date: Fri Sep 30 11:11:42 2016
New Revision: 282871
URL: http://llvm.org/viewvc/llvm-project?rev=282871&view=rev
Log:
Add namespace qualifiers for UTF functions that just moved.
Modified:
lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
Modified: lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp?rev=282871&r1=282870&r2=282871&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp Fri Sep 30
11:11:42 2016
@@ -33,7 +33,7 @@ bool SaveMiniDump(const lldb::ProcessSP
std::wstring wide_name;
wide_name.resize(file_name.size() + 1);
char *result_ptr = reinterpret_cast<char *>(&wide_name[0]);
- const UTF8 *error_ptr = nullptr;
+ const llvm::UTF8 *error_ptr = nullptr;
if (!llvm::ConvertUTF8toWide(sizeof(wchar_t), file_name, result_ptr,
error_ptr)) {
error.SetErrorString("cannot convert file name");
Modified:
lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp?rev=282871&r1=282870&r2=282871&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
(original)
+++ lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
Fri Sep 30 11:11:42 2016
@@ -505,17 +505,17 @@ std::string ProcessWinMiniDump::Impl::Ge
}
auto md_string = reinterpret_cast<const MINIDUMP_STRING *>(
static_cast<const char *>(m_base_addr) + rva);
- auto source_start = reinterpret_cast<const UTF16 *>(md_string->Buffer);
+ auto source_start = reinterpret_cast<const llvm::UTF16 *>(md_string->Buffer);
const auto source_length = ::wcslen(md_string->Buffer);
const auto source_end = source_start + source_length;
result.resize(UNI_MAX_UTF8_BYTES_PER_CODE_POINT *
source_length); // worst case length
- auto result_start = reinterpret_cast<UTF8 *>(&result[0]);
+ auto result_start = reinterpret_cast<llvm::UTF8 *>(&result[0]);
const auto result_end = result_start + result.size();
- ConvertUTF16toUTF8(&source_start, source_end, &result_start, result_end,
- strictConversion);
+ llvm::ConvertUTF16toUTF8(&source_start, source_end, &result_start,
result_end,
+ llvm::ConversionFlags::strictConversion);
const auto result_size =
- std::distance(reinterpret_cast<UTF8 *>(&result[0]), result_start);
+ std::distance(reinterpret_cast<llvm::UTF8 *>(&result[0]), result_start);
result.resize(result_size); // shrink to actual length
return result;
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
