summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/odbc/OResultSet.hxx
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/inc/odbc/OResultSet.hxx
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/inc/odbc/OResultSet.hxx')
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index d1f75371cfe0..8b8218b9164d 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -67,8 +67,8 @@ namespace connectivity
typedef std::pair<sal_Int64,sal_Int32> TVoidPtr;
typedef std::allocator< TVoidPtr > TVoidAlloc;
typedef std::vector<TVoidPtr> TVoidVector;
- /// unary_function Functor object for class ZZ returntype is void
- struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool >
+ /// Functor object for class ZZ returntype is void
+ struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare
{
bool operator()( const css::uno::Sequence<sal_Int8>& _rLH,
const css::uno::Sequence<sal_Int8>& _rRH) const