C++11 remove std::binary_function bases from functors

std::binary_function is deprecated since C++11 and removed in C++17

90% done with regexp magic.
removed obsolete <functional> includes.

The std::binary_function base class was used by deprecated
std::bind2nd, this was solved in individual commits.

The members first_argument_type and second_argument_type were used
in chart2/source/controller/dialogs/DataBrowserModel.cxx:
DataBrowserModel::implColumnLess and are inlined in this commit.

Change-Id: I60ded60a8d4afd59e15ac15a58e18d2498c9be5a
Reviewed-on: https://gerrit.libreoffice.org/39659
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 6 insertions, 14 deletions

diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index c115658c145c..dd92d2734ca2 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -27,7 +27,6 @@
 
 #include <comphelper/extract.hxx>
 
-#include <functional>
 #include <memory>
 
 
@@ -47,7 +46,7 @@ namespace comphelper
 
     //= LessPredicateAdapter
 
-    struct LessPredicateAdapter : public ::std::binary_function< css::uno::Any, css::uno::Any, bool >
+    struct LessPredicateAdapter
     {
         LessPredicateAdapter( const IKeyPredicateLess& _predicate )
             :m_predicate( _predicate )
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 445f66cb3988..c8b583db7f9a 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -24,7 +24,6 @@
 #include <comphelper/extract.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <functional>
 #include <type_traits>
 #include <comphelper/comphelperdllapi.h>
 #include <cppu/unotype.hxx>
@@ -33,7 +32,7 @@ namespace comphelper
 {
 
     // comparing two property instances
-    struct PropertyCompareByName : public ::std::binary_function< css::beans::Property, css::beans::Property, bool >
+    struct PropertyCompareByName
     {
         bool operator() (const css::beans::Property& x, const css::beans::Property& y) const
         {
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 594d6889cf21..b82db0c9c8ec 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -22,7 +22,6 @@
 #include <sal/config.h>
 
 #include <math.h>
-#include <functional>
 #include <memory>
 
 #include <rtl/ustring.hxx>
@@ -35,7 +34,7 @@ namespace comphelper
 
 // comparison functors
 
-struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool>
+struct UStringMixLess
 {
     bool m_bCaseSensitive;
 public:
@@ -51,7 +50,7 @@ public:
     bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
 
-class UStringMixEqual: public std::binary_function<OUString, OUString, bool>
+class UStringMixEqual
 {
     bool m_bCaseSensitive;
 
@@ -64,7 +63,7 @@ public:
     bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
 
-class TPropertyValueEqualFunctor : public ::std::binary_function< css::beans::PropertyValue,OUString,bool>
+class TPropertyValueEqualFunctor
 {
 public:
     TPropertyValueEqualFunctor()
@@ -77,7 +76,6 @@ public:
 
 /// by-value less functor for std::set<std::unique_ptr<T>>
 template<class T> struct UniquePtrValueLess
-    : public ::std::binary_function<std::unique_ptr<T>, std::unique_ptr<T>, bool>
 {
         bool operator()(std::unique_ptr<T> const& lhs,
                         std::unique_ptr<T> const& rhs) const
@@ -115,10 +113,6 @@ bool ContainerUniquePtrEquals(
 */
 template < class IAFCE >
 struct OInterfaceCompare
-    :public ::std::binary_function  <   css::uno::Reference< IAFCE >
-                                    ,   css::uno::Reference< IAFCE >
-                                    ,   bool
-                                    >
 {
     bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const
     {
@@ -131,7 +125,7 @@ struct OInterfaceCompare
 };
 
 template <class Tp, class Arg>
-class mem_fun1_t : public ::std::binary_function<Tp*,Arg,void>
+class mem_fun1_t
 {
     typedef void (Tp::*_fun_type)(Arg);
 public: