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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 4 12:24:48 UTC 2020


 compilerplugins/clang/test/getstr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a8edae67c106f3793ca71540eb0e1740a5f18c1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 4 11:46:03 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 4 14:24:10 2020 +0200

    Adapt compilerplugins/clang/test/getstr.cxx to latest MSVC standard library
    
    ...that now defines the wide-character-to-narrow-stream inserters as deleted
    too, at least in C++20 mode.
    
    Change-Id: I554f2530d5905e46343bf0d8bf12a6feb3d63075
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100073
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/test/getstr.cxx b/compilerplugins/clang/test/getstr.cxx
index 59b52a390e3a..976d39c25c71 100644
--- a/compilerplugins/clang/test/getstr.cxx
+++ b/compilerplugins/clang/test/getstr.cxx
@@ -24,7 +24,7 @@
 // "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__
+#if __cplusplus > 201703L && (defined __GLIBCXX__ || defined _MSC_VER)
 #define HAVE_DELETED_OPERATORS true
 #else
 #define HAVE_DELETED_OPERATORS false


More information about the Libreoffice-commits mailing list