From 92b478ef314d5defba8df3004c9b1ea561f0ac3a Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 5 Oct 2024 08:42:08 +0200 Subject: [PATCH] Fix compilation with libc++ --- CHANGELOG.md | 3 +++ configure.ac | 2 +- src/helpers/song_iterator_maker.h | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e3f3610..2bd386fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# ncmpcpp-0.10.1 (2024-??-??) +* Fix compilation with `libc++`. + # ncmpcpp-0.10 (2024-09-03) * Add the configuration option `mpd_password`. * Separate chunks of lyrics with a double newline. diff --git a/configure.ac b/configure.ac index 5bf81246..86936fd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ncmpcpp],[0.10]) +AC_INIT([ncmpcpp],[0.10.1_dev]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/src/helpers/song_iterator_maker.h b/src/helpers/song_iterator_maker.h index 4c0f96ea..25b1b941 100644 --- a/src/helpers/song_iterator_maker.h +++ b/src/helpers/song_iterator_maker.h @@ -46,8 +46,8 @@ SongIterator makeSongIterator(IteratorT it) > Extractor; static_assert( std::is_convertible< - typename std::result_of::type, - SongProperties & + std::invoke_result_t, + SongProperties & >::value, "invalid result type of SongPropertiesExtractor"); return SongIterator(boost::make_transform_iterator(it, Extractor{})); } @@ -60,8 +60,8 @@ ConstSongIterator makeConstSongIterator(ConstIteratorT it) > Extractor; static_assert( std::is_convertible< - typename std::result_of::type, - const SongProperties & + std::invoke_result_t, + const SongProperties & >::value, "invalid result type of SongPropertiesExtractor"); return ConstSongIterator(boost::make_transform_iterator(it, Extractor{})); }