From b414bb2708aa573890aa8afc039bb17561915173 Mon Sep 17 00:00:00 2001 From: Ian Dunn Date: Thu, 24 Aug 2017 19:09:43 -0700 Subject: Replace std::binary_function with std::function (#31) * std::binary_function is deprecated in C++11, removed in C++17 - replace with std::function * Remove inheritance of std::function<...> that is not necessary. See #31 --- SimpleIni.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SimpleIni.h b/SimpleIni.h index b0cad33..6cf5ced 100644 --- a/SimpleIni.h +++ b/SimpleIni.h @@ -328,7 +328,7 @@ public: #endif /** Strict less ordering by name of key only */ - struct KeyOrder : std::binary_function { + struct KeyOrder { bool operator()(const Entry & lhs, const Entry & rhs) const { const static SI_STRLESS isLess = SI_STRLESS(); return isLess(lhs.pItem, rhs.pItem); @@ -336,7 +336,7 @@ public: }; /** Strict less ordering by order, and then name of key */ - struct LoadOrder : std::binary_function { + struct LoadOrder { bool operator()(const Entry & lhs, const Entry & rhs) const { if (lhs.nOrder != rhs.nOrder) { return lhs.nOrder < rhs.nOrder; -- cgit v1.2.3