mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove HAVE_CXX11_REF_QUALIFIER, always true now

Browse Source 
...after 579497164f "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>
This commit is contained in:
Stephan Bergmann
2017-06-16 10:57:12 +02:00
parent 9c0cd667da
commit c127c19de6
4 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host/config_global.h.in
View File

@@ -13,7 +13,6 @@ Any change in this header will cause a rebuild of almost everything.
#define CONFIG_GLOBAL_H #define CONFIG_GLOBAL_H
#define HAVE_CXX14_CONSTEXPR 0 #define HAVE_CXX14_CONSTEXPR 0
#define HAVE_CXX11_REF_QUALIFIER 0
#define HAVE_GCC_BUILTIN_ATOMIC 0 #define HAVE_GCC_BUILTIN_ATOMIC 0
/* _Pragma */ /* _Pragma */
#define HAVE_GCC_PRAGMA_OPERATOR 0 #define HAVE_GCC_PRAGMA_OPERATOR 0

4
configure.ac
View File

@@ -6228,8 +6228,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
AC_LANG_POP([C++]) AC_LANG_POP([C++])
CXXFLAGS=$save_CXXFLAGS CXXFLAGS=$save_CXXFLAGS
AC_MSG_RESULT([$cxx11_ref_qualifier]) AC_MSG_RESULT([$cxx11_ref_qualifier])
if test "$cxx11_ref_qualifier" = yes; then if test "$cxx11_ref_qualifier" = no; then
AC_DEFINE([HAVE_CXX11_REF_QUALIFIER]) AC_MSG_ERROR([Your $CXX does not support C++11 ref-qualifiers. This is no longer supported.])
fi fi
dnl _Pragma support (may require C++11) dnl _Pragma support (may require C++11)

13
include/rtl/string.hxx
View File

@@ -33,7 +33,6 @@
#include <rtl/stringutils.hxx> #include <rtl/stringutils.hxx>
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING" #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
#include <config_global.h>
#include <rtl/stringconcat.hxx> #include <rtl/stringconcat.hxx>
#endif #endif
@@ -351,14 +350,14 @@ public:
@param str a OString. @param str a OString.
*/ */
OString & operator+=( const OString & str ) OString & operator+=( const OString & str )
#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER #if defined LIBO_INTERNAL_ONLY
& &
#endif #endif
{ {
rtl_string_newConcat( &pData, pData, str.pData ); rtl_string_newConcat( &pData, pData, str.pData );
return *this; return *this;
} }
#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER #if defined LIBO_INTERNAL_ONLY
void operator+=(OString const &) && = delete; void operator+=(OString const &) && = delete;
#endif #endif
@@ -368,11 +367,7 @@ public:
@internal @internal
*/ */
template< typename T1, typename T2 > template< typename T1, typename T2 >
OString& operator+=( const OStringConcat< T1, T2 >& c ) OString& operator+=( const OStringConcat< T1, T2 >& c ) & {
#if HAVE_CXX11_REF_QUALIFIER
&
#endif
{
sal_Int32 l = c.length(); sal_Int32 l = c.length();
if( l == 0 ) if( l == 0 )
return *this; return *this;
@@ -383,10 +378,8 @@ public:
pData->length = l; pData->length = l;
return *this; return *this;
} }
#if HAVE_CXX11_REF_QUALIFIER
template<typename T1, typename T2> void operator +=( template<typename T1, typename T2> void operator +=(
OStringConcat<T1, T2> const &) && = delete; OStringConcat<T1, T2> const &) && = delete;
#endif
#endif #endif
/** /**

32
include/rtl/ustring.hxx
View File

@@ -523,7 +523,7 @@ public:
@exception std::bad_alloc is thrown if an out-of-memory condition occurs @exception std::bad_alloc is thrown if an out-of-memory condition occurs
*/ */
OUString & operator+=( const OUString & str ) OUString & operator+=( const OUString & str )
#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER #if defined LIBO_INTERNAL_ONLY
& &
#endif #endif
{ {
@@ -536,7 +536,7 @@ public:
rtl_uString_release(pNewData); rtl_uString_release(pNewData);
return *this; return *this;
} }
#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER #if defined LIBO_INTERNAL_ONLY
void operator+=(OUString const &) && = delete; void operator+=(OUString const &) && = delete;
#endif #endif
@@ -549,7 +549,7 @@ public:
template<typename T> template<typename T>
typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type
operator +=(T & literal) operator +=(T & literal)
#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER #if defined LIBO_INTERNAL_ONLY
& &
#endif #endif
{ {
@@ -561,7 +561,7 @@ public:
libreoffice_internal::ConstCharArrayDetector<T>::length); libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this; return *this;
} }
#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER #if defined LIBO_INTERNAL_ONLY
template<typename T> template<typename T>
typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type
operator +=(T &) && = delete; operator +=(T &) && = delete;
@@ -572,37 +572,25 @@ public:
template<typename T> template<typename T>
typename typename
libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16 libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16
operator +=(T & literal) operator +=(T & literal) & {
#if HAVE_CXX11_REF_QUALIFIER
&
#endif
{
rtl_uString_newConcatUtf16L( rtl_uString_newConcatUtf16L(
&pData, pData, &pData, pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal), libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length); libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this; return *this;
} }
#if HAVE_CXX11_REF_QUALIFIER
template<typename T> template<typename T>
typename typename
libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16 libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16
operator +=(T &) && = delete; operator +=(T &) && = delete;
#endif
/** @overload @since LibreOffice 5.4 */ /** @overload @since LibreOffice 5.4 */
OUString & operator +=(OUStringLiteral const & literal) OUString & operator +=(OUStringLiteral const & literal) & {
#if HAVE_CXX11_REF_QUALIFIER
&
#endif
{
rtl_uString_newConcatAsciiL(&pData, pData, literal.data, literal.size); rtl_uString_newConcatAsciiL(&pData, pData, literal.data, literal.size);
return *this; return *this;
} }
#if HAVE_CXX11_REF_QUALIFIER
void operator +=(OUStringLiteral const &) && = delete; void operator +=(OUStringLiteral const &) && = delete;
#endif #endif
#endif
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING" #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
/** /**
@@ -610,11 +598,7 @@ public:
@internal @internal
*/ */
template< typename T1, typename T2 > template< typename T1, typename T2 >
OUString& operator+=( const OUStringConcat< T1, T2 >& c ) OUString& operator+=( const OUStringConcat< T1, T2 >& c ) & {
#if HAVE_CXX11_REF_QUALIFIER
&
#endif
{
sal_Int32 l = c.length(); sal_Int32 l = c.length();
if( l == 0 ) if( l == 0 )
return *this; return *this;
@@ -625,10 +609,8 @@ public:
pData->length = l; pData->length = l;
return *this; return *this;
} }
#if HAVE_CXX11_REF_QUALIFIER
template<typename T1, typename T2> void operator +=( template<typename T1, typename T2> void operator +=(
OUStringConcat<T1, T2> const &) && = delete; OUStringConcat<T1, T2> const &) && = delete;
#endif
#endif #endif
/** /**