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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/connection.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 4c36eb9982c9..2390bcf467e1 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -380,7 +380,7 @@ void SAL_CALL OConnection::clearWarnings( ) namespace { - struct CompareTypeByName : public std::binary_function< Type, Type, bool > + struct CompareTypeByName { bool operator() ( const Type& _rLHS, const Type& _rRHS ) const { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 88b29f800642..68c8d140ddcf 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -275,7 +275,7 @@ class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener > } TConnectionHolder; // the less-compare functor, used for the stl::map - struct TDigestLess : public std::binary_function< TDigestHolder, TDigestHolder, bool> + struct TDigestLess { bool operator() (const TDigestHolder& x, const TDigestHolder& y) const { diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 5f4fafb65e36..8493190d4d56 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -94,7 +94,7 @@ namespace dbaui }; typedef std::vector< DisplayedType > DisplayedTypes; - struct DisplayedTypeLess : std::binary_function< DisplayedType, DisplayedType, bool > + struct DisplayedTypeLess { bool operator() ( const DisplayedType& _rLHS, const DisplayedType& _rRHS ) { diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index beff20b48c31..7c7bc1dd0eb6 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace dbaui { - struct SbaURLCompare : public std::binary_function< css::util::URL, css::util::URL, bool> + struct SbaURLCompare { bool operator() (const css::util::URL& x, const css::util::URL& y) const { return x.Complete == y.Complete; } }; |