diff options
author | B Stack <bgstack15@gmail.com> | 2020-10-03 01:04:14 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-10-03 01:04:14 +0000 |
commit | 0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c (patch) | |
tree | d8a89392817379e3036c42eedebf33d4fb372dfd /zen/stl_tools.h | |
parent | Merge branch '11.1' into 'master' (diff) | |
parent | add upstream 11.2 (diff) | |
download | FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.tar.gz FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.tar.bz2 FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.zip |
Merge branch '11.2' into 'master'11.2
add upstream 11.2
See merge request opensource-tracking/FreeFileSync!26
Diffstat (limited to 'zen/stl_tools.h')
-rw-r--r-- | zen/stl_tools.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/zen/stl_tools.h b/zen/stl_tools.h index 7d071413..495ff8d1 100644 --- a/zen/stl_tools.h +++ b/zen/stl_tools.h @@ -185,18 +185,8 @@ BidirectionalIterator1 searchLast(const BidirectionalIterator1 first1, Bid } } - -//--------------------------------------------------------------------------------------- -//http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0458r2.html - -template <class Container, class ValueType, typename = std::enable_if_t<!IsStringLikeV<Container>>> inline - bool contains(const Container& c, const ValueType& val, int dummy = 0 /*overload string_tools.h contains()*/) -{ - return c.find(val) != c.end(); -} //--------------------------------------------------------------------------------------- - //read-only variant of std::merge; input: two sorted ranges template <class Iterator, class FunctionLeftOnly, class FunctionBoth, class FunctionRightOnly> inline void mergeTraversal(Iterator first1, Iterator last1, |