averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use perfect forwarding on the Predicate passed into none_of/count_if.

Browse Source 
This ensures that if one wishes to pass an std::moved, std::function into the
functions, one can do that.
This commit is contained in:
Michael Gottesman
2016-03-08 15:02:13 -08:00
parent bb15808554
commit ef6ff01fd8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/swift/Basic/Range.h
View File

@@ -270,8 +270,8 @@ template <class T> EnumeratorRange<T> enumerate(T Begin, T End) {
/// An adaptor of std::none_of for ranges.
template <class Range, class Predicate>
inline bool none_of(const Range &R, Predicate P) {
return std::none_of(R.begin(), R.end(), P);
inline bool none_of(const Range &R, Predicate &&P) {
return std::none_of(R.begin(), R.end(), std::forward<Predicate>(P));
}
/// An adaptor of std::count for ranges.
@@ -290,9 +290,9 @@ inline auto count(const Range &R, Value V)
/// We use std::result_of on Range::begin since llvm::iterator_range does not
/// have a public typedef set to what is the underlying iterator.
template <class Range, class Predicate>
inline auto count_if(const Range &R, Predicate P)
inline auto count_if(const Range &R, Predicate &&P)
-> typename std::iterator_traits<decltype(R.begin())>::difference_type {
return std::count_if(R.begin(), R.end(), P);
return std::count_if(R.begin(), R.end(), std::forward<Predicate>(P));
}
} // namespace swift