From c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Wed, 28 Jun 2017 21:48:22 +0200 Subject: 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 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 Tested-by: Stephan Bergmann --- vcl/source/app/IconThemeSelector.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'vcl/source/app/IconThemeSelector.cxx') diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 95ee517b6f21..2f976d9cb8c0 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -20,8 +20,7 @@ namespace vcl { namespace { - class SameTheme : - public std::unary_function + class SameTheme { private: const OUString& m_rThemeId; -- cgit v1.2.3