libstdc++: Stop using std::unary_function in perf tests

This fixes some -Wdeprecated-declarations warnings.

libstdc++-v3/ChangeLog:

	* testsuite/performance/ext/pb_ds/hash_int_erase_mem.cc: Replace
	std::unary_function with result_type and argument_type typedefs.
	* testsuite/util/performance/assoc/multimap_common_type.hpp:
	Likewise.

diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_int_erase_mem.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_int_erase_mem.cc
index d011e753b9d7ab8b9c94c7f60d5c4862e8b27e89..e2337a20929cbad770c71e4c873194c20f4e653a 100644 (file)
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_int_erase_mem.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_int_erase_mem.cc
@@ -45,8 +45,11 @@
 #include <vector>
 #include <functional>
 
-struct int_hash : public std::unary_function<int, int>
+struct int_hash
 {
+  typedef int result_type;
+  typedef int argument_type;
+
   inline int
   operator()(int i) const
   { return i; }

diff --git a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
index 3a38be4ba5bab86b25b6f6646ef225c7c86b6a60..8186042b2a3528b50d1a2f99a86a90a4e327e7da 100644 (file)
--- a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
@@ -46,8 +46,11 @@ namespace __gnu_pbds
   {
     namespace detail
     {
-      struct int_hash : public std::unary_function<int, size_t>
+      struct int_hash
       {
+       typedef size_t result_type;
+       typedef int argument_type;
+
        inline size_t
         operator()(const int i) const
        { return (static_cast<size_t>(i)); }