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 /comphelper | |
| 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 'comphelper')
| -rw-r--r-- | comphelper/source/property/opropertybag.cxx | 3 | ||||
| -rw-r--r-- | comphelper/source/property/propertycontainerhelper.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 84e1e7527ff7..243c3920c7cd 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -32,7 +32,6 @@ #include <osl/thread.h> #include <algorithm> -#include <functional> #include <iterator> @@ -350,7 +349,7 @@ namespace comphelper namespace { - struct ComparePropertyValueByName : public std::binary_function< PropertyValue, PropertyValue, bool > + struct ComparePropertyValueByName { bool operator()( const PropertyValue& _rLHS, const PropertyValue& _rRHS ) { diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index a32b8d8def87..c1729c5576b9 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::beans; namespace { // comparing two property descriptions - struct PropertyDescriptionHandleCompare : public std::binary_function< PropertyDescription, PropertyDescription, bool > + struct PropertyDescriptionHandleCompare { bool operator() (const PropertyDescription& x, const PropertyDescription& y) const { |