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 /filter/source | |
| 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 'filter/source')
| -rw-r--r-- | filter/source/config/cache/typedetection.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index edb991294a67..d1b9911e7ccb 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -296,7 +296,7 @@ int getFlatTypeRank(const OUString& rType) * types, then types that are supported by the document service come next. * Lastly, sort them alphabetically. */ -struct SortByPriority : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool> +struct SortByPriority { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const { @@ -320,7 +320,7 @@ struct SortByPriority : public std::binary_function<FlatDetectionInfo, FlatDetec } }; -struct SortByType : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool> +struct SortByType { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const @@ -329,7 +329,7 @@ struct SortByType : public std::binary_function<FlatDetectionInfo, FlatDetection } }; -struct EqualByType : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool> +struct EqualByType { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const { |