From 28cc4dde490655c2bc88d0328c73ed33615cc2a8 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 8 Mar 2016 15:12:52 +0000 Subject: Implement P0253R1: Fixing a design mistake in the searchers interface. llvm-svn: 262928 --- libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libcxx/test/std/experimental/algorithms') diff --git a/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp b/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp index 60a44e4c26a..579c13ddc4d 100644 --- a/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp +++ b/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp @@ -15,7 +15,7 @@ // ForwardIterator search(ForwardIterator first, ForwardIterator last, // const Searcher& searcher); // -// returns searcher.operator(first, last) +// returns searcher.operator(first, last).first // #include @@ -27,10 +27,11 @@ int searcher_called = 0; struct MySearcher { template - Iterator operator() ( Iterator b, Iterator /*e*/) const + std::pair + operator() (Iterator b, Iterator e) const { ++searcher_called; - return b; + return std::make_pair(b, e); } }; -- cgit v1.2.3