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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/inc/fmcontrolbordermanager.hxx | 2 | ||||
| -rw-r--r-- | svx/source/inc/formcontroller.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index c46e41da32e5..56928376809b 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -103,7 +103,7 @@ namespace svxform class ControlBorderManager { private: - struct ControlDataCompare : public ::std::binary_function< ControlData, ControlData, bool > + struct ControlDataCompare { bool operator()( const ControlData& _rLHS, const ControlData& _rRHS ) const { diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index d28b0ae0fb48..3de25a068d94 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -79,7 +79,7 @@ #include <cppuhelper/compbase.hxx> -struct FmXTextComponentLess : public ::std::binary_function< css::uno::Reference< css::awt::XTextComponent >, css::uno::Reference< css::awt::XTextComponent> , bool> +struct FmXTextComponentLess { bool operator() (const css::uno::Reference< css::awt::XTextComponent >& x, const css::uno::Reference< css::awt::XTextComponent >& y) const { |