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 --- xmloff/source/forms/ifacecompare.hxx | 4 ---- xmloff/source/forms/layerexport.cxx | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'xmloff/source/forms') diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx index 9eab7abfb655..79b4bae04b2e 100644 --- a/xmloff/source/forms/ifacecompare.hxx +++ b/xmloff/source/forms/ifacecompare.hxx @@ -32,10 +32,6 @@ namespace xmloff */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < css::uno::Reference< IAFCE > - , css::uno::Reference< IAFCE > - , bool - > { bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index bd08dcb6d77d..aea4f1206521 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -458,7 +458,7 @@ namespace xmloff namespace { - struct AccumulateSize : public ::std::binary_function< size_t, MapPropertySet2Map::value_type, size_t > + struct AccumulateSize { size_t operator()( size_t _size, const MapPropertySet2Map::value_type& _map ) const { -- cgit