util/SortList: kludge for Android NDK compatibility

This commit is contained in:
Max Kellermann 2022-11-11 19:17:11 +01:00
parent 0fd4c14043
commit 29143dec87

View File

@ -43,7 +43,11 @@
template<typename List> template<typename List>
constexpr void constexpr void
MergeList(List &dest, List &src, MergeList(List &dest, List &src,
std::predicate<typename List::const_reference, typename List::const_reference> auto p) noexcept #ifndef ANDROID
/* Android NDK r25b has no std::predicate */
std::predicate<typename List::const_reference, typename List::const_reference>
#endif
auto p) noexcept
{ {
const auto dest_end = dest.end(), src_end = src.end(); const auto dest_end = dest.end(), src_end = src.end();
@ -85,7 +89,11 @@ MergeList(List &dest, List &src,
template<typename List> template<typename List>
constexpr void constexpr void
SortList(List &list, SortList(List &list,
std::predicate<typename List::const_reference, typename List::const_reference> auto p) noexcept #ifndef ANDROID
/* Android NDK r25b has no std::predicate */
std::predicate<typename List::const_reference, typename List::const_reference>
#endif
auto p) noexcept
{ {
using std::swap; using std::swap;