summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-06-28 21:48:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-03 12:21:03 +0200
commitc4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch)
tree128225fc91bd7da687f965337a49b9b64fbe8a79 /comphelper
parent5034e8217c9844293dc94e5dff0bdc865ad7a91a (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')
-rw-r--r--comphelper/source/misc/asyncnotification.cxx3
-rw-r--r--comphelper/source/misc/namedvaluecollection.cxx5
-rw-r--r--comphelper/source/property/opropertybag.cxx4
-rw-r--r--comphelper/source/property/opropertybag.hxx2
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx2
5 files changed, 7 insertions, 9 deletions
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index bb53b096a5d7..88489ec65e3a 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -27,7 +27,6 @@
#include <deque>
#include <stdexcept>
#include <vector>
-#include <functional>
#include <algorithm>
namespace comphelper
@@ -60,7 +59,7 @@ namespace comphelper
typedef std::deque< ProcessableEvent > EventQueue;
- struct EqualProcessor : public std::unary_function< ProcessableEvent, bool >
+ struct EqualProcessor
{
const ::rtl::Reference< IEventProcessor >& rProcessor;
explicit EqualProcessor( const ::rtl::Reference< IEventProcessor >& _rProcessor ) :rProcessor( _rProcessor ) { }
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 84e705f8b287..a6f732937b4e 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -28,7 +28,6 @@
#include <sal/log.hxx>
#include <algorithm>
-#include <functional>
#include <unordered_map>
namespace comphelper
@@ -311,7 +310,7 @@ namespace comphelper
namespace
{
- struct Value2PropertyValue : public std::unary_function< NamedValueRepository::value_type, PropertyValue >
+ struct Value2PropertyValue
{
PropertyValue operator()( const NamedValueRepository::value_type& _rValue )
{
@@ -320,7 +319,7 @@ namespace comphelper
}
};
- struct Value2NamedValue : public std::unary_function< NamedValueRepository::value_type, NamedValue >
+ struct Value2NamedValue
{
NamedValue operator()( const NamedValueRepository::value_type& _rValue )
{
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 ) { }