From 3b35da403d9a419fcdb8cc953c0c4c4d106592bf Mon Sep 17 00:00:00 2001
From: Thomas Lange <thomas-lange2@gmx.de>
Date: Thu, 11 Jan 2024 23:15:41 +0100
Subject: [PATCH] Test compilation with c++20 std

---
 acinclude.m4             | 6 +++---
 meson.build              | 2 +-
 src/libaudgui/infowin.cc | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 07cb6f8a2..1709fad08 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -104,9 +104,9 @@ if test "x$GCC" = "xyes"; then
     CXXFLAGS="$CXXFLAGS -ffast-math -Wall -pipe"
 
     # use C++17 if possible (Qt 6 requires it)
-    AUD_CHECK_CXXFLAGS(-std=gnu++17)
-    if test "${CXXFLAGS%gnu++17}" = "$CXXFLAGS" ; then
-        CXXFLAGS="$CXXFLAGS -std=gnu++11"
+    AUD_CHECK_CXXFLAGS(-std=c++20)
+    if test "${CXXFLAGS%c++20}" = "$CXXFLAGS" ; then
+        CXXFLAGS="$CXXFLAGS -std=c++11"
     fi
 
     AUD_CHECK_CFLAGS(-Wtype-limits)
diff --git a/meson.build b/meson.build
index e4af229ce..84daa13e7 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('audacious', 'c', 'cpp',
         meson_version: '>= 0.46',
         default_options: [
           'c_std=gnu99',
-          'cpp_std=gnu++17',
+          'cpp_std=c++20',
           'warning_level=1'
         ])
 
diff --git a/src/libaudgui/infowin.cc b/src/libaudgui/infowin.cc
index ccb3359d4..8bb402d37 100644
--- a/src/libaudgui/infowin.cc
+++ b/src/libaudgui/infowin.cc
@@ -516,7 +516,7 @@ static void infowin_show (Playlist list, int entry, const String & filename,
 EXPORT void audgui_infowin_show (Playlist playlist, int entry)
 {
     String filename = playlist.entry_filename (entry);
-    g_return_if_fail (filename != nullptr);
+    g_return_if_fail (filename);
 
     String error;
     PluginHandle * decoder = playlist.entry_decoder (entry, Playlist::Wait, & error);