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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 71ac0dac9a585b4383460c4f34314a6083a87685
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Nov 15 08:09:29 2021 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Nov 15 09:53:18 2021 +0100

    Adapt CompilerTest_compilerplugins_clang
    
    ...to Clang 14 trunk
    
<https://github.com/llvm/llvm-project/commit/4d8fff477e024698facd89741cc6cf996708d598>
    "[clang] retain type sugar in auto / template argument deduction"
    
    Change-Id: I3f106eeedf00e622c294c4e4c8326cf3a5e418cf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125214
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/compilerplugins/clang/test/stringconcatauto.cxx 
b/compilerplugins/clang/test/stringconcatauto.cxx
index 8318e3c4a26f..dc450503d25e 100644
--- a/compilerplugins/clang/test/stringconcatauto.cxx
+++ b/compilerplugins/clang/test/stringconcatauto.cxx
@@ -14,17 +14,17 @@
 void foo()
 {
     auto str1 = "str1" + OUString::number(10);
-    // expected-error-re@-1 {{creating a variable of type 
'rtl::OUStringConcat<{{.*}}>' will make it reference temporaries}}
+    // expected-error-re@-1 {{creating a variable of type {{.+}} will make it 
reference temporaries}}
     // expected-note@-2 {{use OUString instead}}
     OUString str2 = "str2" + OUString::number(20) + "ing";
     const auto& str3 = "str3" + OUString::number(30);
-    // expected-error-re@-1 {{creating a variable of type 'const 
rtl::OUStringConcat<{{.*}}> &' will make it reference temporaries}}
+    // expected-error-re@-1 {{creating a variable of type {{.+}} will make it 
reference temporaries}}
     // expected-note@-2 {{use OUString instead}}
     const auto str4 = "str4" + OString::number(40);
-    // expected-error-re@-1 {{creating a variable of type 'const 
rtl::OStringConcat<{{.*}}>' will make it reference temporaries}}
+    // expected-error-re@-1 {{creating a variable of type {{.+}} will make it 
reference temporaries}}
     // expected-note@-2 {{use OString instead}}
     auto str5 = OUString::number(50);
-    // expected-error-re@-1 {{creating a variable of type 
'rtl::OUStringNumber<{{.*}}>' will make it reference temporaries}}
+    // expected-error-re@-1 {{creating a variable of type 
'{{(rtl::)?}}OUStringNumber<{{.*}}>' will make it reference temporaries}}
     // expected-note@-2 {{use OUString instead}}
     (void)str1;
     (void)str2;
@@ -36,13 +36,13 @@ void foo()
 struct A
 {
     auto bar()
-    // expected-error-re@-1 {{returning a variable of type 
'rtl::OStringConcat<{{.*}}>' will make it reference temporaries}}
+    // expected-error-re@-1 {{returning a variable of type {{.+}} will make it 
reference temporaries}}
     // expected-note@-2 {{use OString instead}}
     {
         return "bar" + OString::number(110);
     }
     auto baz()
-    // expected-error-re@-1 {{returning a variable of type 
'rtl::OStringNumber<{{.*}}>' will make it reference temporaries}}
+    // expected-error-re@-1 {{returning a variable of type 
'{{(rtl::)?}}OStringNumber<{{.*}}>' will make it reference temporaries}}
     // expected-note@-2 {{use OString instead}}
     {
         return OString::number(120);