a bit nicer functor usage

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8304 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-01-05 18:00:12 +00:00
parent 4b1212acf2
commit 159b879729
2 changed files with 13 additions and 10 deletions

View File

@ -1,5 +1,9 @@
2004-01-05 Lars Gullik Bjonnes <larsbj@gullik.net>
* InsetList.C: replace functor MathcIt with adaptable functor
InsetTablePosLess
(insetIterator): modify accordingly
* BranchList.h: move the BranchNamesEqual functor here from...
* BranchList.C: ... to here

View File

@ -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<InsetList::InsetTable, InsetList::InsetTable, bool> {
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());
}