diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-25 12:34:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-25 12:34:06 +0200 |
| commit | ed691eca99da36f3c20558edd08786224539a7ab (patch) | |
| tree | e708580570d59ef8091e0a7763ac9757c4618a2c /storage | |
| parent | a3da3c8a0b1113d941f837cce0615673b95fb9f2 (diff) | |
| download | mariadb-git-ed691eca99da36f3c20558edd08786224539a7ab.tar.gz | |
Remove deprecated (in C++11) std::binary_function
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0debug.cc | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 48a1944f0e1..1884250ee48 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -16327,7 +16327,7 @@ struct ShowStatus { }; /** Order by m_waits, in descending order. */ - struct OrderByWaits: public std::binary_function<Value, Value, bool> + struct OrderByWaits { /** @return true if rhs < lhs */ bool operator()( diff --git a/storage/innobase/sync/sync0debug.cc b/storage/innobase/sync/sync0debug.cc index 89db512da2a..6ddb8d97f9b 100644 --- a/storage/innobase/sync/sync0debug.cc +++ b/storage/innobase/sync/sync0debug.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2020, MariaDB Corporation. +Copyright (c) 2017, 2022, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -100,10 +100,6 @@ struct LatchDebug { /** Comparator for the ThreadMap. */ struct os_thread_id_less - : public std::binary_function< - os_thread_id_t, - os_thread_id_t, - bool> { /** @return true if lhs < rhs */ bool operator()( @@ -389,10 +385,6 @@ private: private: /** Comparator for the Levels . */ struct latch_level_less - : public std::binary_function< - latch_level_t, - latch_level_t, - bool> { /** @return true if lhs < rhs */ bool operator()( |