diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-07-02 17:10:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-07 08:31:48 +0200 |
| commit | db4741043d09437af871fa8ea9849ec37e946f9b (patch) | |
| tree | 3ed043060e283bc6b3b386bacc4a6ff84e42f3ab /sc/workben | |
| parent | 307e528275cb91776e8f5560b3137c3c1649b39c (diff) | |
C++11 remove std::binary_function bases from functors
std::binary_function is deprecated since C++11 and removed in C++17
90% done with regexp magic.
removed obsolete <functional> includes.
The std::binary_function base class was used by deprecated
std::bind2nd, this was solved in individual commits.
The members first_argument_type and second_argument_type were used
in chart2/source/controller/dialogs/DataBrowserModel.cxx:
DataBrowserModel::implColumnLess and are inlined in this commit.
Change-Id: I60ded60a8d4afd59e15ac15a58e18d2498c9be5a
Reviewed-on: https://gerrit.libreoffice.org/39659
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/workben')
| -rw-r--r-- | sc/workben/dpcache/perf-test.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/workben/dpcache/perf-test.cpp b/sc/workben/dpcache/perf-test.cpp index d93630e6ac56..28e7027207a2 100644 --- a/sc/workben/dpcache/perf-test.cpp +++ b/sc/workben/dpcache/perf-test.cpp @@ -15,7 +15,6 @@ #include <vector> #include <iterator> #include <algorithm> -#include <functional> using namespace std; @@ -254,7 +253,7 @@ void print_buckets(const vector<bucket>& buckets, const char* msg) cout << "---" << endl; } -struct less_by_value : std::binary_function<bucket, bucket, bool> +struct less_by_value { bool operator() (const bucket& left, const bucket& right) const { @@ -262,7 +261,7 @@ struct less_by_value : std::binary_function<bucket, bucket, bool> } }; -struct less_by_data_index : std::binary_function<bucket, bucket, bool> +struct less_by_data_index { bool operator() (const bucket& left, const bucket& right) const { @@ -270,7 +269,7 @@ struct less_by_data_index : std::binary_function<bucket, bucket, bool> } }; -struct equal_by_value : std::binary_function<bucket, bucket, bool> +struct equal_by_value { bool operator() (const bucket& left, const bucket& right) const { |