Kaydet (Commit) f4884d05 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove HAVE_CXX11_UTF16_STRING_LITERAL, always true now

...after 84b36c70 "Drop support for MSVC 2013".

Make this a fatal configuration error for now.  The check should be removed
completely after LO 5.4 branch-off.

Change-Id: If2f196abb93607dde9ba5c4f04d219679585e633
Reviewed-on: https://gerrit.libreoffice.org/34822Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst b1674661
......@@ -14,7 +14,6 @@ Any change in this header will cause a rebuild of almost everything.
#define HAVE_CXX14_CONSTEXPR 0
#define HAVE_CXX11_REF_QUALIFIER 0
#define HAVE_CXX11_UTF16_STRING_LITERAL 0
#define HAVE_GCC_BUILTIN_ATOMIC 0
/* _Pragma */
#define HAVE_GCC_PRAGMA_OPERATOR 0
......
......@@ -6309,8 +6309,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
AC_LANG_POP([C++])
CXXFLAGS=$save_CXXFLAGS
AC_MSG_RESULT([$cxx11_utf16_string_literal])
if test "$cxx11_utf16_string_literal" = yes; then
AC_DEFINE([HAVE_CXX11_UTF16_STRING_LITERAL])
if test "$cxx11_utf16_string_literal" = no; then
AC_MSG_ERROR([Your $CXX does not support UTF-16 string literals. This is no longer supported.])
fi
dnl _Pragma support (may require C++11)
......
......@@ -44,7 +44,7 @@ private:
b2 = "1234567890123456";
CPPUNIT_ASSERT_EQUAL(s3, b2.toString());
CPPUNIT_ASSERT_EQUAL(sal_Int32(32), b2.getCapacity());
#if HAVE_CXX11_UTF16_STRING_LITERAL && !defined SAL_W32
#if !defined SAL_W32
// sal_Unicode is still wchar_t not char16_t even for MSVC 2015
OUStringBuffer b3;
b3 = u"123456789012345";
......
......@@ -353,7 +353,7 @@ void test::oustring::StringLiterals::checkOUStringLiteral1()
}
void test::oustring::StringLiterals::checkUtf16() {
#if HAVE_CXX11_UTF16_STRING_LITERAL && !defined SAL_W32
#if !defined SAL_W32
// 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment