diff options
author | Dimitar Vlahovski <dvlahovski@google.com> | 2016-09-30 14:36:17 +0000 |
---|---|---|
committer | Dimitar Vlahovski <dvlahovski@google.com> | 2016-09-30 14:36:17 +0000 |
commit | 7ca05307c92f2d5d7dc317f5fc676edbfad0fdcd (patch) | |
tree | 00e0cb5c870dbf881ea8cc6b9271dc6b45298a96 | |
parent | 888ab55140c63382a589e16a8b19722c08e6d3b1 (diff) | |
download | bcm5719-llvm-7ca05307c92f2d5d7dc317f5fc676edbfad0fdcd.tar.gz bcm5719-llvm-7ca05307c92f2d5d7dc317f5fc676edbfad0fdcd.zip |
Fixing windows build breakage caused by rL282822
The breakage was because of the moving of the UTF functions to the llvm
namespace
llvm-svn: 282862
-rw-r--r-- | lldb/source/Host/windows/Windows.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lldb/source/Host/windows/Windows.cpp b/lldb/source/Host/windows/Windows.cpp index 8347b82f272..68f1c1846df 100644 --- a/lldb/source/Host/windows/Windows.cpp +++ b/lldb/source/Host/windows/Windows.cpp @@ -32,21 +32,21 @@ int _chdir(const char *path); namespace { bool utf8ToWide(const char *utf8, wchar_t *buf, size_t bufSize) { - const UTF8 *sourceStart = reinterpret_cast<const UTF8 *>(utf8); + const llvm::UTF8 *sourceStart = reinterpret_cast<const llvm::UTF8 *>(utf8); size_t sourceLen = strlen(utf8) + 1 /* convert null too */; - UTF16 *target = reinterpret_cast<UTF16 *>(buf); - ConversionFlags flags = strictConversion; - return ConvertUTF8toUTF16(&sourceStart, sourceStart + sourceLen, &target, - target + bufSize, flags) == conversionOK; + llvm::UTF16 *target = reinterpret_cast<llvm::UTF16 *>(buf); + llvm::ConversionFlags flags = strictConversion; + return llvm::ConvertUTF8toUTF16(&sourceStart, sourceStart + sourceLen, &target, + target + bufSize, flags) == llvm::conversionOK; } bool wideToUtf8(const wchar_t *wide, char *buf, size_t bufSize) { - const UTF16 *sourceStart = reinterpret_cast<const UTF16 *>(wide); + const llvm::UTF16 *sourceStart = reinterpret_cast<const llvm::UTF16 *>(wide); size_t sourceLen = wcslen(wide) + 1 /* convert null too */; - UTF8 *target = reinterpret_cast<UTF8 *>(buf); - ConversionFlags flags = strictConversion; - return ConvertUTF16toUTF8(&sourceStart, sourceStart + sourceLen, &target, - target + bufSize, flags) == conversionOK; + llvm::UTF8 *target = reinterpret_cast<llvm::UTF8 *>(buf); + llvm::ConversionFlags flags = strictConversion; + return llvm::ConvertUTF16toUTF8(&sourceStart, sourceStart + sourceLen, &target, + target + bufSize, flags) == llvm::conversionOK; } } |