From cc6693bebb3dbcb6bd608bd95b8109919e2bf365 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 2 Sep 2016 11:28:09 +0200 Subject: Fix MSVC 2015 build ...which has HAVE_CXX11_UTF16_STRING_LITERAL but cannot use chart16_t string literals with ConstCharArrayDetector (which uses sal_Unicode) as long as sal_Unicode is still wchar_t instead of char16_t for MSVC. Change-Id: I7c55e0361d1c8c717467d5ab6c942bce3569f3a7 --- sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sal') diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx index e257d7d13f9e..082e83e9dd7c 100644 --- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx @@ -254,7 +254,9 @@ void test::oustring::StringLiterals::checkOUStringLiteral1() } void test::oustring::StringLiterals::checkUtf16() { -#if HAVE_CXX11_UTF16_STRING_LITERAL +#if HAVE_CXX11_UTF16_STRING_LITERAL \ + && (!defined SAL_W32 || defined __MINGW32__) + // sal_Unicode is still wchar_t not char16_t even for MSVC 2015 rtl::OUString s1(u"abc"); CPPUNIT_ASSERT_EQUAL(rtl::OUString("abc"), s1); s1 = u"de"; -- cgit