Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with libc++

Browse Source
This commit is contained in:
Andrzej Rybczak
2024-10-05 08:42:08 +02:00
parent 72d990fe25
commit 92b478ef31
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,3 +1,6 @@
# ncmpcpp-0.10.1 (2024-??-??)
* Fix compilation with `libc++`.
# ncmpcpp-0.10 (2024-09-03) # ncmpcpp-0.10 (2024-09-03)
* Add the configuration option `mpd_password`. * Add the configuration option `mpd_password`.
* Separate chunks of lyrics with a double newline. * Separate chunks of lyrics with a double newline.

2
configure.ac
View File

@@ -1,4 +1,4 @@
AC_INIT([ncmpcpp],[0.10]) AC_INIT([ncmpcpp],[0.10.1_dev])
AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])

4
src/helpers/song_iterator_maker.h
View File

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