Author: dvlahovski
Date: Fri Sep 30 09:36:17 2016
New Revision: 282862
URL: http://llvm.org/viewvc/llvm-project?rev=282862&view=rev
Log:
Fixing windows build breakage caused by rL282822
The breakage was because of the moving of the UTF functions to the llvm
namespace
Modified:
lldb/trunk/source/Host/windows/Windows.cpp
Modified: lldb/trunk/source/Host/windows/Windows.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/Windows.cpp?rev=282862&r1=282861&r2=282862&view=diff
==============================================================================
--- lldb/trunk/source/Host/windows/Windows.cpp (original)
+++ lldb/trunk/source/Host/windows/Windows.cpp Fri Sep 30 09:36:17 2016
@@ -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;
}
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
