Merge branch 'stl' of git://github.com/neheb/MPD

src/song/AndSongFilter.cxx

@@ -19,6 +19,8 @@
 
 #include "AndSongFilter.hxx"
 
+#include <algorithm>
+
 ISongFilterPtr
 AndSongFilter::Clone() const noexcept
 {
@@ -54,9 +56,5 @@ AndSongFilter::ToExpression() const noexcept
 bool
 AndSongFilter::Match(const LightSong &song) const noexcept
 {
-	for (const auto &i : items)
-		if (!i->Match(song))
-			return false;
-
-	return true;
+	return std::all_of(items.begin(), items.end(), [&song](const auto &i) { return i->Match(song); });
 }