From e3869a48fc2e5fbb9e8eb7058e5176446479673f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 24 May 2021 18:27:16 +0100 Subject: [PATCH] libstdc++: Remove useless base classes in pb_db tests These function objects do not need to be adaptable, so stop deriving from deprecated classes. Also the 'inline' keyword is redundant on member functions defined in the class body. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * testsuite/ext/pb_ds/example/basic_multimap.cc: Remove unnecesary derivation from std::unary_function. * testsuite/ext/pb_ds/example/erase_if.cc: Likewise. * testsuite/ext/pb_ds/example/hash_illegal_resize.cc: Likewise. * testsuite/ext/pb_ds/example/hash_initial_size.cc: Likewise. * testsuite/ext/pb_ds/example/hash_load_set_change.cc: Likewise. * testsuite/ext/pb_ds/example/hash_mod.cc: Likewise. * testsuite/ext/pb_ds/example/hash_resize.cc: Likewise. * testsuite/ext/pb_ds/example/hash_shift_mask.cc: Likewise. * testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc: Likewise. * testsuite/ext/pb_ds/example/ranged_hash.cc: Likewise. * testsuite/ext/pb_ds/example/store_hash.cc: Likewise. --- libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc | 4 ++-- libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc | 1 - libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc | 4 ++-- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc index 1d0b491..143f3ee 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc @@ -51,9 +51,9 @@ using namespace __gnu_pbds; // A simple hash functor. // hash could serve instead of this functor, but it is not yet // standard everywhere. -struct string_hash : public unary_function +struct string_hash { - inline size_t + size_t operator()(const string& r_s) const { size_t ret = 0; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc index 74ed846..bb8e9c4 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc @@ -48,7 +48,7 @@ using namespace __gnu_pbds; // The following functor takes a map's value-type object and returns // whether its key is between two numbers. -struct between : public unary_function, bool> +struct between { // Constructor taking two numbers determining a range. between(int b, int e) : m_b(b), m_e(e) @@ -56,7 +56,7 @@ struct between : public unary_function, bool> // Operator determining whether a value-type object's key is within // the range. - inline bool + bool operator()(const pair& r_val) { return r_val.first >= m_b&& r_val.first < m_e; } diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc index d045b40..73eda50 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc @@ -62,9 +62,9 @@ using namespace __gnu_pbds; // A simple hash functor. // hash could serve instead of this functor, but it is not yet // standard everywhere. -struct int_hash : public unary_function +struct int_hash { - inline size_t + size_t operator()(const int& r_i) const { return r_i; } }; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc index 0fe99d2..a69c9c9 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc @@ -49,9 +49,9 @@ using namespace __gnu_pbds; // A simple hash functor. // hash could serve instead of this functor, but it is not yet // standard everywhere. -struct int_hash : public unary_function +struct int_hash { - inline size_t + size_t operator()(const int& r_i) const { return r_i; } }; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc index 976291f..8f7ed27 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc @@ -51,9 +51,9 @@ using namespace __gnu_pbds; // A simple hash functor. // hash could serve instead of this functor, but it is not yet // standard everywhere. -struct int_hash : public unary_function +struct int_hash { - inline size_t + size_t operator()(int i) const { return i; } }; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc index f57a6ad..d42e6d8 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc @@ -49,9 +49,9 @@ using namespace __gnu_pbds; // A simple hash functor. // hash could serve instead of this functor, but it is not yet // standard everywhere. -struct int_hash : public unary_function +struct int_hash { - inline size_t + size_t operator()(int i) const { return i; } }; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc index 53c5e26..f8e4a7b 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc @@ -50,9 +50,9 @@ using namespace __gnu_pbds; // A simple hash functor. // hash could serve instead of this functor, but it is not yet // standard everywhere. -struct int_hash : public unary_function +struct int_hash { - inline size_t + size_t operator()(const int& r_i) const { return r_i; } }; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc index 19fb3d3..0ea02da 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc @@ -51,9 +51,9 @@ using namespace __gnu_pbds; // A simple hash functor. hash could serve instead of this functor, // but it is not yet standard everywhere. -struct simple_int_hash : public unary_function +struct simple_int_hash { - inline size_t + size_t operator()(int i) const { return i; } }; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc index 1910e2c..d99ebff7 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc @@ -61,9 +61,9 @@ using namespace __gnu_pbds; typedef std::pair pq_value; // Comparison functor used to compare priority-queue value types. -struct pq_value_cmp : public binary_function +struct pq_value_cmp { - inline bool + bool operator()(const pq_value& r_lhs, const pq_value& r_rhs) const { // Note that a value is considered smaller than a different value diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc index a5b1898..86c37d4 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc @@ -60,7 +60,6 @@ using namespace __gnu_pbds; * for larger sizes it uses a more complicated hash function. */ class simple_string_ranged_hash_fn - : public unary_function { public: typedef size_t size_type; diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc index 0bf6b06..5dd9cb7 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc @@ -53,9 +53,9 @@ using namespace std; using namespace __gnu_pbds; // A string hash functor. -struct string_hash : public unary_function +struct string_hash { - inline size_t + size_t operator()(string str) const { string::const_iterator b = str.begin(); -- 2.7.4