diff options
Diffstat (limited to 'libcxx/test/std/algorithms')
5 files changed, 30 insertions, 26 deletions
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp index ea4270e..4e4f889 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp @@ -51,7 +51,7 @@ struct S { }; struct eq { - bool operator()(const S& a, const S&b) { return a.i_ == b.i_; } + bool operator()(const S& a, const S& b) const { return a.i_ == b.i_; } }; diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp index 3bf72e3..2fa3e9f 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp @@ -32,12 +32,13 @@ TEST_CONSTEXPR bool test_constexpr() { } #endif -struct count_equal -{ - static unsigned count; - template <class T> - bool operator()(const T& x, const T& y) - {++count; return x == y;} +struct count_equal { + static unsigned count; + template <class T> + bool operator()(const T& x, const T& y) const { + ++count; + return x == y; + } }; unsigned count_equal::count = 0; diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp index f835d2f..cfb82f3 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp @@ -36,8 +36,15 @@ struct count_equal { static unsigned count; template <class T> - bool operator()(const T& x, const T& y) - {++count; return x == y;} + bool operator()(const T& x, const T& y) & { + ++count; + return x == y; + }; + template <class T> + bool operator()(const T& x, const T& y) const& { + ++count; + return x == y; + }; }; unsigned count_equal::count = 0; diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp index d103e8c..ebff401 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp @@ -24,11 +24,11 @@ #if TEST_STD_VER >= 11 #include <memory> -struct indirect_less -{ - template <class P> - bool operator()(const P& x, const P& y) - {return *x < *y;} +struct indirect_less { + template <class P> + bool operator()(const P& x, const P& y) const { + return *x < *y; + } }; struct S { @@ -119,7 +119,7 @@ test() struct less_by_first { template <typename Pair> - bool operator()(const Pair& lhs, const Pair& rhs) { + bool operator()(const Pair& lhs, const Pair& rhs) const { return std::less<typename Pair::first_type>()(lhs.first, rhs.first); } }; diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp index 46c2a42..5ee6d89 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp @@ -25,21 +25,17 @@ #include "test_macros.h" -struct indirect_less -{ - template <class P> - bool operator()(const P& x, const P& y) - {return *x < *y;} +struct indirect_less { + template <class P> + bool operator()(const P& x, const P& y) const { + return *x < *y; + } }; std::mt19937 randomness; -struct first_only -{ - bool operator()(const std::pair<int, int>& x, const std::pair<int, int>& y) - { - return x.first < y.first; - } +struct first_only { + bool operator()(const std::pair<int, int>& x, const std::pair<int, int>& y) const { return x.first < y.first; } }; void test() |