[Libreoffice-commits] core.git: config_host/config_global.h.in configure.ac sal/qa

[Stephan Bergmann]

 config_host/config_global.h.in                           |    1 -
 configure.ac                                             |    4 ++--
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx |    2 +-
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx      |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f4884d051f1eea07a0fe371834cb7c1da1cbee07
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 2 17:48:57 2017 +0100

    Remove HAVE_CXX11_UTF16_STRING_LITERAL, always true now
    
    ...after 84b36c704d73362d4d86dc9e9c0efa0625958347 "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/34822
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index a773818..e06f477 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -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
diff --git a/configure.ac b/configure.ac
index c56e6f3..9b4f742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
index aa14225..287b3a0 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
@@ -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";
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index b221306..49f2f16 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -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);