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 /cppu | |
| parent | Translate German comments and debug strings (leftovers in dirs sal to sc) (diff) | |
| download | core-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 'cppu')
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 3 | ||||
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index db32cec51d08..0439a242e5a4 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -93,8 +93,7 @@ struct ObjectEntry }; -struct FctPtrHash : - public std::unary_function< const void *, std::size_t > +struct FctPtrHash { std::size_t operator () ( const void * pKey ) const { return reinterpret_cast< std::size_t>( pKey ); } diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index e8dcc574e58a..c1b52f4f27a3 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -130,7 +130,7 @@ struct MappingEntry {} }; -struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > +struct FctPtrHash { size_t operator()( uno_Mapping * pKey ) const { return reinterpret_cast<size_t>(pKey); } |