diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-30 10:35:19 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-30 10:35:19 +0000 |
| commit | f790cdc5775bb1234a9c2666218456d80825966e (patch) | |
| tree | cf344e045d5ebdffe0afc35f2de68b8908857808 /zen/stl_tools.h | |
| parent | Merge branch '10.18' into 'master' (diff) | |
| parent | add upstream 10.19 (diff) | |
| download | FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.tar.gz FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.tar.bz2 FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.zip | |
Merge branch '10.19' into 'master'10.19
add upstream 10.19
See merge request opensource-tracking/FreeFileSync!16
Diffstat (limited to 'zen/stl_tools.h')
| -rw-r--r-- | zen/stl_tools.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/stl_tools.h b/zen/stl_tools.h index d09010ad..8856ce84 100644 --- a/zen/stl_tools.h +++ b/zen/stl_tools.h @@ -96,7 +96,7 @@ public: /**/ T& ref() { return *ref_; }; const T& ref() const { return *ref_; }; - std::shared_ptr< T> ptr() { return ref_; }; + std::shared_ptr< T> ptr() { return ref_; }; std::shared_ptr<const T> ptr() const { return ref_; }; private: @@ -207,9 +207,9 @@ 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()*/) + bool contains(const Container& c, const ValueType& val, int dummy = 0 /*overload string_tools.h contains()*/) { - return c.find(val) != c.end(); + return c.find(val) != c.end(); } //--------------------------------------------------------------------------------------- |