configure.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1eef07805021b7ca26a1a8894809b6d995747ba1
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Aug 1 08:49:44 2023 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Sep 22 09:19:58 2023 +0200

    Bump baseline to C++20
    
    Change-Id: I47c3a3bdbf2b7b85f8f6f91b694625197aab8002
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155121
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/configure.ac b/configure.ac
index 0cebc8b88925..6595593d3d1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7550,18 +7550,18 @@ dnl C++11
 dnl ===================================================================
 
 if test -z "${CXXFLAGS_CXX11+x}"; then
-    AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
+    AC_MSG_CHECKING([whether $CXX_BASE supports C++20])
     if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
         if test "$with_latest_c__" = yes; then
             CXXFLAGS_CXX11=-std:c++latest
         else
-            CXXFLAGS_CXX11=-std:c++17
+            CXXFLAGS_CXX11=-std:c++20
         fi
         CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -permissive- 
-Zc:__cplusplus,preprocessor"
     elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
-        my_flags='-std=c++17 -std=c++1z'
+        my_flags='-std=c++20 -std=c++2a'
         if test "$with_latest_c__" = yes; then
-            my_flags="-std=c++26 -std=c++2c -std=c++23 -std=c++2b -std=c++20 
-std=c++2a $my_flags"
+            my_flags="-std=c++26 -std=c++2c -std=c++23 -std=c++2b $my_flags"
         fi
         for flag in $my_flags; do
             if test "$COM" = MSC; then

Reply via email to