From 0f2a6027e9bbf2aeb77e492f00221a976ee610af Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 2 Dec 2016 19:58:32 +0000 Subject: [PATCH] Make sure tstring can store wchar_t. This currently blocks anyone from writing unit tests for strlist.cpp because the tests are not Unicode yet! git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6806 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/utf.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/utf.cpp b/Source/utf.cpp index 8d0f8425..7658552a 100644 --- a/Source/utf.cpp +++ b/Source/utf.cpp @@ -32,6 +32,9 @@ bool StrSetUTF16LE(tstring&dest, const void*src) if (!cec.Initialize(-1,NStreamEncoding::UTF16LE)) return false; src = (const void*) cec.Convert(src); if (!src) return false; +#endif +#ifdef C_ASSERT + C_ASSERT(sizeof(tstring::value_type) >= sizeof(wchar_t)); #endif try { dest = (wchar_t*) src; } catch(...) { return false; } return true;