Skip to content

Commit ed691ec

Browse files
committed
Remove deprecated (in C++11) std::binary_function
1 parent a3da3c8 commit ed691ec

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

storage/innobase/handler/ha_innodb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16327,7 +16327,7 @@ struct ShowStatus {
1632716327
};
1632816328

1632916329
/** Order by m_waits, in descending order. */
16330-
struct OrderByWaits: public std::binary_function<Value, Value, bool>
16330+
struct OrderByWaits
1633116331
{
1633216332
/** @return true if rhs < lhs */
1633316333
bool operator()(

storage/innobase/sync/sync0debug.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2017, 2020, MariaDB Corporation.
4+
Copyright (c) 2017, 2022, MariaDB Corporation.
55
66
Portions of this file contain modifications contributed and copyrighted by
77
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -100,10 +100,6 @@ struct LatchDebug {
100100

101101
/** Comparator for the ThreadMap. */
102102
struct os_thread_id_less
103-
: public std::binary_function<
104-
os_thread_id_t,
105-
os_thread_id_t,
106-
bool>
107103
{
108104
/** @return true if lhs < rhs */
109105
bool operator()(
@@ -389,10 +385,6 @@ struct LatchDebug {
389385
private:
390386
/** Comparator for the Levels . */
391387
struct latch_level_less
392-
: public std::binary_function<
393-
latch_level_t,
394-
latch_level_t,
395-
bool>
396388
{
397389
/** @return true if lhs < rhs */
398390
bool operator()(

0 commit comments

Comments
 (0)