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 /vcl/source | |
| 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 'vcl/source')
| -rw-r--r-- | vcl/source/window/layout.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/taskpanelist.cxx | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 0473c541ae0f..af32ca98dab2 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -869,7 +869,6 @@ static int getButtonPriority(const OString &rType) } class sortButtons - : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { bool m_bVerticalContainer; public: diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index bc1fcb3d906d..a11f8d78b826 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -25,7 +25,6 @@ #include <svdata.hxx> #include "menubarwindow.hxx" -#include <functional> #include <algorithm> namespace { @@ -51,7 +50,7 @@ Point ImplTaskPaneListGetPos( const vcl::Window *w ) } // compares window pos left-to-right -struct LTRSort : public ::std::binary_function< const vcl::Window*, const vcl::Window*, bool > +struct LTRSort { bool operator()( const vcl::Window* w1, const vcl::Window* w2 ) const { @@ -64,7 +63,7 @@ struct LTRSort : public ::std::binary_function< const vcl::Window*, const vcl::W return ( pos1.X() < pos2.X() ); } }; -struct LTRSortBackward : public ::std::binary_function< const vcl::Window*, const vcl::Window*, bool > +struct LTRSortBackward { bool operator()( const vcl::Window* w2, const vcl::Window* w1 ) const { |