diff options
Diffstat (limited to 'test/std/experimental/func/func.searchers/func.searchers.default')
4 files changed, 12 insertions, 10 deletions
diff --git a/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp b/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp index 446dcbde42be..4eaf3a870390 100644 --- a/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp +++ b/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp @@ -15,15 +15,16 @@ // template<class _ForwardIterator, class _BinaryPredicate = equal_to<>> // class default_searcher { // public: -// default_searcher(_ForwardIterator __f, _ForwardIterator __l, +// default_searcher(_ForwardIterator __f, _ForwardIterator __l, // _BinaryPredicate __p = _BinaryPredicate()) // : __first_(__f), __last_(__l), __pred_(__p) {} -// +// // template <typename _ForwardIterator2> -// _ForwardIterator2 operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const { +// pair<_ForwardIterator2, _ForwardIterator2> +// operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const { // return std::search(__f, __l, __first_, __last_, __pred_); // } -// +// // private: // _ForwardIterator __first_; // _ForwardIterator __last_; diff --git a/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp b/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp index b65c500c3192..a2f690d7b7bf 100644 --- a/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp +++ b/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp @@ -15,15 +15,16 @@ // template<class _ForwardIterator, class _BinaryPredicate = equal_to<>> // class default_searcher { // public: -// default_searcher(_ForwardIterator __f, _ForwardIterator __l, +// default_searcher(_ForwardIterator __f, _ForwardIterator __l, // _BinaryPredicate __p = _BinaryPredicate()) // : __first_(__f), __last_(__l), __pred_(__p) {} -// +// // template <typename _ForwardIterator2> -// _ForwardIterator2 operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const { +// pair<_ForwardIterator2, _ForwardIterator2> +// operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const { // return std::search(__f, __l, __first_, __last_, __pred_); // } -// +// // private: // _ForwardIterator __first_; // _ForwardIterator __last_; diff --git a/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp b/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp index 9528002d5f2d..7798a6e73f5e 100644 --- a/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp +++ b/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp @@ -25,7 +25,7 @@ template <typename Iter1, typename Iter2> void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result) { - assert(result == std::experimental::search(b1, e1, + assert(result == std::experimental::search(b1, e1, std::experimental::make_default_searcher(b2, e2))); } diff --git a/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp b/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp index 277020213149..21f50a397e2a 100644 --- a/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp +++ b/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp @@ -36,7 +36,7 @@ unsigned count_equal::count = 0; template <typename Iter1, typename Iter2> void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { count_equal::count = 0; - assert(result == std::experimental::search(b1, e1, + assert(result == std::experimental::search(b1, e1, std::experimental::make_default_searcher(b2, e2))); assert(count_equal::count <= max_count); } |