compilerplugins/clang/test/getstr.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 427ba44505fd5be6920899595759ab5dc47c7342
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Aug 4 10:24:43 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Aug 4 14:18:20 2022 +0200

    Adapt test to LLVM 16 trunk libc++
    
    ...see
    
<https://github.com/llvm/llvm-project/commit/309aed306817e5b1a302d8f757231c734cf71370>
    "[libc++] Implement P1423R3 (char8_t backward compatibility remediation)"
    causing
    
    > error: 'error' diagnostics seen but not expected:
    >   compilerplugins/clang/test/getstr.cxx Line 43: overload resolution 
selected deleted operator '<<'
    
    Change-Id: Ic2fb9409cf3033300aca6717a8db7889e9d03c6a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137786
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/compilerplugins/clang/test/getstr.cxx 
b/compilerplugins/clang/test/getstr.cxx
index 7522458c7011..c10939202a9c 100644
--- a/compilerplugins/clang/test/getstr.cxx
+++ b/compilerplugins/clang/test/getstr.cxx
@@ -24,7 +24,9 @@
 // "libstdc++: P1423R3 char8_t remediation (2/4)" for -std=c++2a; TODO: the 
checks here and the
 // relevant code in loplugin:getstr should eventually be removed once support 
for the deleted
 // operators is widespread):
-#if __cplusplus > 201703L && (defined __GLIBCXX__ || defined _MSC_VER)
+#if __cplusplus > 201703L                                                      
                    \
+    && (defined __GLIBCXX__ || defined _MSC_VER                                
                    \
+        || (defined _LIBCPP_VERSION && _LIBCPP_VERSION >= 16000))
 #define HAVE_DELETED_OPERATORS true
 #else
 #define HAVE_DELETED_OPERATORS false

Reply via email to