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 /xmloff | |
| 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 'xmloff')
| -rw-r--r-- | xmloff/source/forms/ifacecompare.hxx | 4 | ||||
| -rw-r--r-- | xmloff/source/forms/layerexport.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/xmlimppr.cxx | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx index 9eab7abfb655..79b4bae04b2e 100644 --- a/xmloff/source/forms/ifacecompare.hxx +++ b/xmloff/source/forms/ifacecompare.hxx @@ -32,10 +32,6 @@ namespace xmloff */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < css::uno::Reference< IAFCE > - , css::uno::Reference< IAFCE > - , bool - > { bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index bd08dcb6d77d..aea4f1206521 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -458,7 +458,7 @@ namespace xmloff namespace { - struct AccumulateSize : public ::std::binary_function< size_t, MapPropertySet2Map::value_type, size_t > + struct AccumulateSize { size_t operator()( size_t _size, const MapPropertySet2Map::value_type& _map ) const { diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 8bd2c30354a2..ca87054c25ac 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -40,7 +40,6 @@ #include <xmloff/maptype.hxx> #include <algorithm> -#include <functional> #include <utility> #include <vector> @@ -546,8 +545,7 @@ bool SvXMLImportPropertyMapper::FillPropertySet_( typedef pair<const OUString*, const Any* > PropertyPair; typedef vector<PropertyPair> PropertyPairs; -struct PropertyPairLessFunctor : - public std::binary_function<PropertyPair, PropertyPair, bool> +struct PropertyPairLessFunctor { bool operator()( const PropertyPair& a, const PropertyPair& b ) const { |