diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-02 11:28:09 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-02 11:28:09 +0200 |
| commit | cc6693bebb3dbcb6bd608bd95b8109919e2bf365 (patch) | |
| tree | dad5e032339d404993320c0e534d50935d8a99d0 /sal | |
| parent | cb93207d215b696a05246472ba4d13a7a3a2949d (diff) | |
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
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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"; |