From c127c19de62201b49b6647ef3ee8b08ae49da852 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 16 Jun 2017 10:57:12 +0200
Subject: Remove HAVE_CXX11_REF_QUALIFIER, always true now

...after 579497164f6bddfeb14bb6b0f4b9cd3322af1803 "Bump GCC baseline to 4.8.1"

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

Change-Id: I70cf65d6b0eb7158008f28449794c66c1b775916
Reviewed-on: https://gerrit.libreoffice.org/38869
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 include/rtl/string.hxx  | 13 +++----------
 include/rtl/ustring.hxx | 32 +++++++-------------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

(limited to 'include')

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 2753713fc66f..c116250aa396 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -33,7 +33,6 @@
 #include <rtl/stringutils.hxx>
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
-#include <config_global.h>
 #include <rtl/stringconcat.hxx>
 #endif
 
@@ -351,14 +350,14 @@ public:
       @param    str         a OString.
     */
     OString & operator+=( const OString & str )
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
         &
 #endif
     {
         rtl_string_newConcat( &pData, pData, str.pData );
         return *this;
     }
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
     void operator+=(OString const &) && = delete;
 #endif
 
@@ -368,11 +367,7 @@ public:
      @internal
     */
     template< typename T1, typename T2 >
-    OString& operator+=( const OStringConcat< T1, T2 >& c )
-#if HAVE_CXX11_REF_QUALIFIER
-        &
-#endif
-    {
+    OString& operator+=( const OStringConcat< T1, T2 >& c ) & {
         sal_Int32 l = c.length();
         if( l == 0 )
             return *this;
@@ -383,10 +378,8 @@ public:
         pData->length = l;
         return *this;
     }
-#if HAVE_CXX11_REF_QUALIFIER
     template<typename T1, typename T2> void operator +=(
         OStringConcat<T1, T2> const &) && = delete;
-#endif
 #endif
 
     /**
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index e4dfe8d8346d..5f41ff3ea2ea 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -523,7 +523,7 @@ public:
       @exception std::bad_alloc is thrown if an out-of-memory condition occurs
     */
     OUString & operator+=( const OUString & str )
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
         &
 #endif
     {
@@ -536,7 +536,7 @@ public:
         rtl_uString_release(pNewData);
         return *this;
     }
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
     void operator+=(OUString const &) && = delete;
 #endif
 
@@ -549,7 +549,7 @@ public:
     template<typename T>
     typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type
     operator +=(T & literal)
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
         &
 #endif
     {
@@ -561,7 +561,7 @@ public:
             libreoffice_internal::ConstCharArrayDetector<T>::length);
         return *this;
     }
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
     template<typename T>
     typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type
     operator +=(T &) && = delete;
@@ -572,37 +572,25 @@ public:
     template<typename T>
     typename
         libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16
-    operator +=(T & literal)
-#if HAVE_CXX11_REF_QUALIFIER
-        &
-#endif
-    {
+    operator +=(T & literal) & {
         rtl_uString_newConcatUtf16L(
             &pData, pData,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
             libreoffice_internal::ConstCharArrayDetector<T>::length);
         return *this;
     }
-#if HAVE_CXX11_REF_QUALIFIER
     template<typename T>
     typename
         libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16
     operator +=(T &) && = delete;
-#endif
 
     /** @overload @since LibreOffice 5.4 */
-    OUString & operator +=(OUStringLiteral const & literal)
-#if HAVE_CXX11_REF_QUALIFIER
-        &
-#endif
-    {
+    OUString & operator +=(OUStringLiteral const & literal) & {
         rtl_uString_newConcatAsciiL(&pData, pData, literal.data, literal.size);
         return *this;
     }
-#if HAVE_CXX11_REF_QUALIFIER
     void operator +=(OUStringLiteral const &) && = delete;
 #endif
-#endif
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
     /**
@@ -610,11 +598,7 @@ public:
      @internal
     */
     template< typename T1, typename T2 >
-    OUString& operator+=( const OUStringConcat< T1, T2 >& c )
-#if HAVE_CXX11_REF_QUALIFIER
-        &
-#endif
-    {
+    OUString& operator+=( const OUStringConcat< T1, T2 >& c ) & {
         sal_Int32 l = c.length();
         if( l == 0 )
             return *this;
@@ -625,10 +609,8 @@ public:
         pData->length = l;
         return *this;
     }
-#if HAVE_CXX11_REF_QUALIFIER
     template<typename T1, typename T2> void operator +=(
         OUStringConcat<T1, T2> const &) && = delete;
-#endif
 #endif
 
     /**
-- 
cgit