diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-28 21:48:22 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 12:21:03 +0200 |
commit | c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch) | |
tree | 128225fc91bd7da687f965337a49b9b64fbe8a79 /comphelper/source/property | |
parent | 5034e8217c9844293dc94e5dff0bdc865ad7a91a (diff) |
C++11 remove std::unary_function bases from functors
std::unary_function is deprecated since C++11 and removed in C++17
90% done with regexp magic.
removed obsolete <functional> includes.
The std::unary_function base class was used in 3 places:
* chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole
is used in a std::not1 function helper who uses the members
return_type and argument_type.
- replace deprecated std::not1 with a lambda
* chart2/source/tools/ModifyListenerHelper.cxx:
lcl_weakReferenceToSame used the argument_type member in the
operator() parameter.
- inline the parameter type.
* xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement
used result_type and argument_type in operator().
- inline the types
Also fix compile error with gcc about finding std::for_each.
Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f
Reviewed-on: https://gerrit.libreoffice.org/39358
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'comphelper/source/property')
-rw-r--r-- | comphelper/source/property/opropertybag.cxx | 4 | ||||
-rw-r--r-- | comphelper/source/property/opropertybag.hxx | 2 | ||||
-rw-r--r-- | comphelper/source/property/propertycontainerhelper.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index e36507a599ed..740de1ca2df4 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -359,7 +359,7 @@ namespace comphelper }; template< typename CLASS > - struct TransformPropertyToName : public std::unary_function< CLASS, OUString > + struct TransformPropertyToName { const OUString& operator()( const CLASS& _rProp ) { @@ -367,7 +367,7 @@ namespace comphelper } }; - struct ExtractPropertyValue : public std::unary_function< PropertyValue, Any > + struct ExtractPropertyValue { const Any& operator()( const PropertyValue& _rProp ) { diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 650f981852ed..95736d7923db 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -44,7 +44,7 @@ namespace comphelper { - struct UnoTypeLess : public std::unary_function< css::uno::Type, bool > + struct UnoTypeLess { bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index dcde4190d495..7a57de445f98 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -49,7 +49,7 @@ namespace } }; // comparing two property descriptions (by name) - struct PropertyDescriptionNameMatch : public std::unary_function< PropertyDescription, bool > + struct PropertyDescriptionNameMatch { OUString m_rCompare; explicit PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } |