Changes in src/Descriptors/AtomDescriptor.cpp [8cce2b:6d574a]

File:

• src/Descriptors/AtomDescriptor.cpp (modified) (4 diffs)

src/Descriptors/AtomDescriptor.cpp

@@ -13 +13 @@
 #include "World.hpp"
 #include "atom.hpp"
-#include "Patterns/ObservedContainer_impl.hpp"
 
 #include <boost/bind.hpp>
@@ -21 +20 @@
 using namespace std;
 
-typedef World::AtomSet::internal_iterator atoms_iter_t;
+typedef World::AtomSet::iterator atoms_iter_t;
 
 /************************ Forwarding object **************************************/
@@ -74 +73 @@
 
 atom* AtomDescriptor_impl::find() {
-  World::AtomSet &atoms = getAtoms();
-  atoms_iter_t res = find_if(atoms.begin_internal(),atoms.end_internal(),boost::bind(&AtomDescriptor_impl::predicate,this,_1));
-  return (res!=atoms.end_internal())?((*res).second):0;
+  World::AtomSet atoms = getAtoms();
+  atoms_iter_t res = find_if(atoms.begin(),atoms.end(),boost::bind(&AtomDescriptor_impl::predicate,this,_1));
+  return (res!=atoms.end())?((*res).second):0;
 }
 
@@ -82 +81 @@
   vector<atom*> res;
   World::AtomSet atoms = getAtoms();
-  for_each(atoms.begin_internal(),
-           atoms.end_internal(),
-           boost::bind(&AtomDescriptor_impl::checkAndAdd,
-                       this,&res,_1));
+  atoms_iter_t iter;
+  for(iter=atoms.begin();iter!=atoms.end();++iter) {
+    if(predicate(*iter)){
+      res.push_back((*iter).second);
+    }
+  }
   return res;
-}
-
-void AtomDescriptor_impl::checkAndAdd(std::vector<atom*> *v,std::pair<atomId_t,atom*> p){
-  if(predicate(p)){
-    v->push_back(p.second);
-  }
 }