From db4741043d09437af871fa8ea9849ec37e946f9b Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Sun, 2 Jul 2017 17:10:53 +0200 Subject: 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 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 Reviewed-by: Noel Grandin --- filter/source/config/cache/typedetection.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'filter/source') 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 +struct SortByPriority { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const { @@ -320,7 +320,7 @@ struct SortByPriority : public std::binary_function +struct SortByType { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const @@ -329,7 +329,7 @@ struct SortByType : public std::binary_function +struct EqualByType { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const { -- cgit