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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 31cd6fd0f3c856a81a03d0229de1c4d10442844f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Dec 20 19:27:52 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Dec 20 21:28:23 2020 +0100

    Make OStringLiteral ctor non-explicit
    
    a5bdf3c606b562a2af3dd4e4162b734abb1cb24c "Make O[U]StringLiteral ctor explicit"
    made both the OStringLiteral and the OUStringLiteral ctor explicit, and
    87707670c993794ab12b0fad0f048f11429269c2 "Make OUStringLiteral more useful" made
    (only) the OUStringLiteral ctor non-explicit again.  There appears to be no good
    reason to keep the OStringLiteral ctor explict, and the current sitation lead to
    
      OUStringLiteral v = u"...";
    
    being valid while
    
      OStringLiteral v = "...";
    
    was not (and needed to be written as
    
      OStringLieral v("...");
    
    instead).
    
    Change-Id: Ide26917efabb6eca31c19f64652ee87460e6dd1a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108056
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index e5e7f5716b74..4b4c683d4b6d 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -89,7 +89,7 @@ public:
 #else
     constexpr
 #endif
-    explicit OStringLiteral(char const (&literal)[N]) {
+    OStringLiteral(char const (&literal)[N]) {
         assertLayout();
         assert(literal[N - 1] == '\0');
         //TODO: Use C++20 constexpr std::copy_n (P0202R3):