summaryrefslogtreecommitdiff
path: root/connectivity/source/manager
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-07-02 17:10:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-07 08:31:48 +0200
commitdb4741043d09437af871fa8ea9849ec37e946f9b (patch)
tree3ed043060e283bc6b3b386bacc4a6ff84e42f3ab /connectivity/source/manager
parent307e528275cb91776e8f5560b3137c3c1649b39c (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 'connectivity/source/manager')
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 3905932fed85..b69e8646910e 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -212,7 +212,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
}
/// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names
- struct CompareDriverAccessByName : public std::binary_function< DriverAccess, DriverAccess, bool >
+ struct CompareDriverAccessByName
{
bool operator()( const DriverAccess& lhs, const DriverAccess& rhs )
@@ -222,7 +222,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
};
/// and STL argorithm compatible predicate comparing a DriverAccess' impl name to a string
- struct EqualDriverAccessToName : public std::binary_function< DriverAccess, OUString, bool >
+ struct EqualDriverAccessToName
{
OUString m_sImplName;
explicit EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){}