diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-07-02 17:10:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-07 08:31:48 +0200 |
| commit | db4741043d09437af871fa8ea9849ec37e946f9b (patch) | |
| tree | 3ed043060e283bc6b3b386bacc4a6ff84e42f3ab /forms | |
| parent | 307e528275cb91776e8f5560b3137c3c1649b39c (diff) | |
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>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/GroupManager.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/propertybaghelper.cxx | 2 | ||||
| -rw-r--r-- | forms/source/inc/componenttools.hxx | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index a925e66551e4..859f6d91e537 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -65,7 +65,7 @@ bool OGroupCompAcc::operator==( const OGroupCompAcc& rCompAcc ) const return m_xComponent == rCompAcc.m_xComponent; } -class OGroupCompAccLess : public ::std::binary_function<OGroupCompAcc, OGroupCompAcc, sal_Bool> +class OGroupCompAccLess { public: bool operator() (const OGroupCompAcc& lhs, const OGroupCompAcc& rhs) const @@ -101,7 +101,7 @@ bool OGroupComp::operator==( const OGroupComp& rComp ) const return m_nTabIndex == rComp.GetTabIndex() && m_nPos == rComp.GetPos(); } -class OGroupCompLess : public ::std::binary_function<OGroupComp, OGroupComp, sal_Bool> +class OGroupCompLess { public: bool operator() (const OGroupComp& lhs, const OGroupComp& rhs) const diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 53ed30505fca..5f14626bd081 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -240,7 +240,7 @@ namespace frm }; - struct PropertyValueLessByName : public ::std::binary_function< PropertyValue, PropertyValue, bool > + struct PropertyValueLessByName { bool operator()( const PropertyValue& _lhs, const PropertyValue& _rhs ) const { diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx index f3e445effd1e..f684ec572220 100644 --- a/forms/source/inc/componenttools.hxx +++ b/forms/source/inc/componenttools.hxx @@ -25,14 +25,13 @@ #include <com/sun/star/frame/XModel.hpp> #include <set> -#include <functional> namespace frm { - struct TypeCompareLess : public ::std::binary_function< css::uno::Type, css::uno::Type, bool > + struct TypeCompareLess { bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { |