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 /sc/workben | |
| 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 'sc/workben')
| -rw-r--r-- | sc/workben/dpcache/perf-test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/workben/dpcache/perf-test.cpp b/sc/workben/dpcache/perf-test.cpp index 8bc5026c0aca..d93630e6ac56 100644 --- a/sc/workben/dpcache/perf-test.cpp +++ b/sc/workben/dpcache/perf-test.cpp @@ -278,7 +278,7 @@ struct equal_by_value : std::binary_function<bucket, bucket, bool> } }; -class push_back_value : std::unary_function<bucket, void> +class push_back_value { std::vector<int>& items; public: @@ -289,7 +289,7 @@ public: } }; -class push_back_order_index : std::unary_function<bucket, void> +class push_back_order_index { std::vector<size_t>& data_indices; public: |