a bit nicer functor usage

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8304 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index ecd51ccce02e7ef58c75405a29e8f048220999ac..e801ed5b1c570e06ecfd8025c7d0d2d817702ce2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
 

diff --git a/src/InsetList.C b/src/InsetList.C
index df45a985db02a0c7919a02b469f440fe92527b1b..db74a08e816f54e0f02796eaaf45a14470091d88 100644 (file)
--- 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<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());
 }