diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-11-08 11:51:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-11-08 17:28:32 +0100 |
| commit | 46875d83476942ca215429c837a3457f55c3ccb0 (patch) | |
| tree | 67724f25960c4582baefa9042b8d376115d19f30 /include/rtl | |
| parent | 5d26b851f27a55cd8cb34973b0ad8d7a3801af7e (diff) | |
A better fix for C++23 P2266R1
After 6d6a143913603b040c10a5db83c2103557899011 "Address some of the sprintf in
vcl/source/fontsubset/cff.cxx", --with-latest-c++ builds that pick up a C++23
compiler that implements
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2266r1.html> "P2266R1:
Simpler implicit move" started to fail with something like
> vcl/source/fontsubset/cff.cxx:2061:16: error: no viable conversion from returned value of type 'char[64]' to function return type 'OString'
> return aDefaultGlyphName;
> ^~~~~~~~~~~~~~~~~
[...]
> include/rtl/string.hxx:313:5: note: candidate constructor [with T = char[64]] not viable: expects an lvalue for 1st argument
> OString( T& value, typename libreoffice_internal::NonConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
> ^
etc. So I figured there should be something better than
433ab39b2175bdadb4916373cd2dc8e1aabc08a5 "Adapt implicit OString return value
construction to C++23 P2266R1" (which this commit reverts, modulo its conflicts
in comphelper/source/xml/xmltools.cxx and
sc/source/filter/xcl97/XclExpChangeTrack.cxx) to address the underlying issue in
a way that keeps code that works up to C++20 also working in C++23.
(The fix is only relevant for non-explicit constructors that involve
NonConstCharArrayDetector and non-const lvalue references, not for other
functions involving those. OUString has a similar constructor but which is
explicit, and OUStringBuffer doesn't have any similar constructors at all, so
this only affects OString and OStringBuffer constructors.)
Change-Id: I31cf16b9507899f5999243f8467dfa24bc94c5ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142455
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/rtl')
| -rw-r--r-- | include/rtl/strbuf.hxx | 11 | ||||
| -rw-r--r-- | include/rtl/string.hxx | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx index dbdcd7fea39a..97368ce3ca4d 100644 --- a/include/rtl/strbuf.hxx +++ b/include/rtl/strbuf.hxx @@ -180,6 +180,17 @@ public: rtl_stringbuffer_newFromStr_WithLength( &pData, value, length ); } +#if __cplusplus > 202002L // C++23 P2266R3 "Simpler implicit move" + template< typename T > + OStringBuffer( T&& value, typename libreoffice_internal::NonConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy()) + : pData(NULL) + { + sal_Int32 length = rtl_str_getLength( value ); + nCapacity = length + 16; + rtl_stringbuffer_newFromStr_WithLength( &pData, value, length ); + } +#endif + /** Constructs a string buffer so that it represents the same sequence of characters as the string literal. diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 472d3074bd1b..24c6a64008cf 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -316,6 +316,15 @@ public: rtl_string_newFromStr( &pData, value ); } +#if __cplusplus > 202002L // C++23 P2266R3 "Simpler implicit move" + template< typename T > + OString( T&& value, typename libreoffice_internal::NonConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() ) + { + pData = NULL; + rtl_string_newFromStr( &pData, value ); + } +#endif + /** New string from a string literal. |