[Libreoffice-commits] core.git: include/rtl

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 23 09:32:30 UTC 2021


 include/rtl/string.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 983c1146ac80c038feae653e8e3752a72171d6cb
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Apr 23 09:15:23 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Apr 23 11:31:43 2021 +0200

    actually make OString(OStringLiteral) constructor constexpr
    
    doh! forgot the most important part in
        commit bca539e889d40e06cb3275442622cb075b2484a2
        make OString(OStringLiteral) constructor constexpr
    
    Change-Id: I0c13b3b8f33f643fa72c11d8596bab70e863a879
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114529
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 348a08055d50..98abce8fca53 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -337,7 +337,7 @@ public:
 
       @since LibreOffice 7.1
     */
-    template<std::size_t N> OString(OStringLiteral<N> const & literal):
+    template<std::size_t N> constexpr OString(OStringLiteral<N> const & literal):
         pData(const_cast<rtl_String *>(&literal.str)) {}
     template<std::size_t N> OString(OStringLiteral<N> &&) = delete;
     /// @endcond


More information about the Libreoffice-commits mailing list