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 /include/o3tl/sorted_vector.hxx | |
| 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 'include/o3tl/sorted_vector.hxx')
| -rw-r--r-- | include/o3tl/sorted_vector.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx index f18ff04588b6..c50e19912ea1 100644 --- a/include/o3tl/sorted_vector.hxx +++ b/include/o3tl/sorted_vector.hxx @@ -11,7 +11,6 @@ #define INCLUDED_O3TL_SORTED_VECTOR_HXX #include <vector> -#include <functional> #include <algorithm> namespace o3tl @@ -196,7 +195,7 @@ private: /** Implements an ordering function over a pointer, where the comparison uses the < operator on the pointed-to types. Very useful for the cases where we put pointers to objects inside a sorted_vector. */ -template <class T> struct less_ptr_to : public std::binary_function <T*,T*,bool> +template <class T> struct less_ptr_to { bool operator() ( T* const& lhs, T* const& rhs ) const { |