* src/inset/InsetNomencl.cpp:

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 2867f49e4ad436ddaca924c05d748a3835d2fb30..8967fab12f52ca2c2f4cc7c8335c1fadffef284d 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -21,6 +21,20 @@ using namespace std;
 
 namespace lyx {
 
+namespace {
+class BranchNamesEqual : public std::unary_function<Branch, bool> {
+public:
+       BranchNamesEqual(docstring const & name)
+               : name_(name) {}
+       bool operator()(Branch const & branch) const
+       {
+               return branch.getBranch() == name_;
+       }
+private:
+       docstring name_;
+};
+}
+
 
 Branch::Branch() : selected_(false)
 {
@@ -82,7 +96,7 @@ void Branch::setColor(string const & str)
 Branch * BranchList::find(docstring const & name)
 {
        List::iterator it =
-               std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
+               find_if(list.begin(), list.end(), BranchNamesEqual(name));
        return it == list.end() ? 0 : &*it;
 }
 
@@ -90,7 +104,7 @@ Branch * BranchList::find(docstring const & name)
 Branch const * BranchList::find(docstring const & name) const
 {
        List::const_iterator it =
-               std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
+               find_if(list.begin(), list.end(), BranchNamesEqual(name));
        return it == list.end() ? 0 : &*it;
 }
 
@@ -108,7 +122,7 @@ bool BranchList::add(docstring const & s)
                        name = s.substr(i, j - i);
                // Is this name already in the list?
                bool const already =
-                       std::find_if(list.begin(), list.end(),
+                       find_if(list.begin(), list.end(),
                                     BranchNamesEqual(name)) != list.end();
                if (!already) {
                        added = true;