Fix compilation with libc++

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.

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])

src/helpers/song_iterator_maker.h

@@ -46,8 +46,8 @@ SongIterator makeSongIterator(IteratorT it)
 		> Extractor;
 	static_assert(
 		std::is_convertible<
-		  typename std::result_of<Extractor(typename IteratorT::reference)>::type,
-		  SongProperties &
+		std::invoke_result_t<Extractor, typename IteratorT::reference>,
+		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<Extractor(typename ConstIteratorT::reference)>::type,
-		  const SongProperties &
+		std::invoke_result_t<Extractor, typename ConstIteratorT::reference>,
+		const SongProperties &
 		>::value, "invalid result type of SongPropertiesExtractor");
 	return ConstSongIterator(boost::make_transform_iterator(it, Extractor{}));
 }