summaryrefslogtreecommitdiffstats
path: root/include/connectivity
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 /include/connectivity
parentTranslate German comments and debug strings (leftovers in dirs sal to sc) (diff)
downloadcore-c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d.tar.gz
core-c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d.zip
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 'include/connectivity')
-rw-r--r--include/connectivity/FValue.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index dfde6cab9342..2c3645ea2ae8 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -471,8 +471,8 @@ namespace connectivity
typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef;
- /// TSetBound is a unary_function to set the bound value with e.q. for_each call
- struct OOO_DLLPUBLIC_DBTOOLS TSetBound : ::std::unary_function<ORowSetValue,void>
+ /// TSetBound is a functor to set the bound value with e.q. for_each call
+ struct OOO_DLLPUBLIC_DBTOOLS TSetBound
{
bool m_bBound;
TSetBound(bool _bBound) : m_bBound(_bBound){}
@@ -481,8 +481,8 @@ namespace connectivity
};
- /// TSetBound is a unary_function to set the bound value with e.q. for_each call
- struct OOO_DLLPUBLIC_DBTOOLS TSetRefBound : ::std::unary_function<ORowSetValueDecoratorRef,void>
+ /// TSetBound is a functor to set the bound value with e.q. for_each call
+ struct OOO_DLLPUBLIC_DBTOOLS TSetRefBound
{
bool m_bBound;
TSetRefBound(bool _bBound) : m_bBound(_bBound){}