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 --- vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/unx/generic/fontmanager') diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index db32f2874919..6e7b69da18d6 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -150,7 +150,7 @@ namespace //Sort fonts so that fonts with the same family name are side-by-side, with //those with higher version numbers first - class SortFont : public ::std::binary_function< const FcPattern*, const FcPattern*, bool > + class SortFont { public: bool operator()(const FcPattern *a, const FcPattern *b) -- cgit