From 159b879729f4832513fbc7f9e46bd754a45c16a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 5 Jan 2004 18:00:12 +0000 Subject: [PATCH] a bit nicer functor usage git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8304 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/InsetList.C | 19 +++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ecd51ccce0..e801ed5b1c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2004-01-05 Lars Gullik Bjonnes + * InsetList.C: replace functor MathcIt with adaptable functor + InsetTablePosLess + (insetIterator): modify accordingly + * BranchList.h: move the BranchNamesEqual functor here from... * BranchList.C: ... to here diff --git a/src/InsetList.C b/src/InsetList.C index df45a985db..db74a08e81 100644 --- a/src/InsetList.C +++ b/src/InsetList.C @@ -26,22 +26,19 @@ using lyx::pos_type; using std::endl; using std::lower_bound; - namespace { -struct MatchIt { - /// used by lower_bound - inline - int operator()(InsetList::InsetTable const & a, - InsetList::InsetTable const & b) const +class InsetTablePosLess : public std::binary_function { +public: + bool operator()(InsetList::InsetTable const & t1, + InsetList::InsetTable const & t2) const { - return a.pos < b.pos; + return t1.pos < t2.pos; } }; } // namespace anon - InsetList::~InsetList() { // If we begin storing a shared_ptr in the List @@ -57,14 +54,16 @@ InsetList::~InsetList() InsetList::iterator InsetList::insetIterator(pos_type pos) { InsetTable search_elem(pos, 0); - return lower_bound(list.begin(), list.end(), search_elem, MatchIt()); + return lower_bound(list.begin(), list.end(), search_elem, + InsetTablePosLess()); } InsetList::const_iterator InsetList::insetIterator(pos_type pos) const { InsetTable search_elem(pos, 0); - return lower_bound(list.begin(), list.end(), search_elem, MatchIt()); + return lower_bound(list.begin(), list.end(), search_elem, + InsetTablePosLess()); } -- 2.39.2