[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/unusedvarsglobal.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ccd073e04478e5c72571dfa302055f6d1153e5aa
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 17 09:14:14 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 17 15:15:32 2020 +0200

    Adapt compilerplugins/clang/test/unusedvarsglobal.cxx
    
    ...to e6dfaf9f44f9939abc338c83b3024108431d0f69 "Turn OUStringLiteral into a
    consteval'ed, static-refcound rtl_uString".  (The original code would have
    started to fail with
    
    > error: 'error' diagnostics seen but not expected:
    >   File compilerplugins/clang/test/unusedvarsglobal.cxx Line 22: declaration of variable 'literal1' with deduced type 'const OUStringLiteral' requires an initializer
    
    when built with Clang >= 11.)
    
    Change-Id: If51a39c8fb42200f064d62f472e8cddcc6e4c434
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102898
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/compilerplugins/clang/test/unusedvarsglobal.cxx b/compilerplugins/clang/test/unusedvarsglobal.cxx
index 98a9970a06df..58c18d0de84c 100644
--- a/compilerplugins/clang/test/unusedvarsglobal.cxx
+++ b/compilerplugins/clang/test/unusedvarsglobal.cxx
@@ -14,14 +14,14 @@
 // expected-no-diagnostics
 #else
 
-#include <rtl/ustring.hxx>
+#include <string_view>
 
 namespace something
 {
 // expected-error at +1 {{write [loplugin:unusedvarsglobal]}}
-extern const OUStringLiteral literal1;
+extern const std::u16string_view literal1;
 }
-const OUStringLiteral something::literal1(u"xxx");
+const std::u16string_view something::literal1(u"xxx");
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */