Changes in src/Actions/AtomsCalculation_impl.hpp [b54ac8:6e97e5]

File:

• src/Actions/AtomsCalculation_impl.hpp (modified) (2 diffs)

src/Actions/AtomsCalculation_impl.hpp

@@ -19 +19 @@
 AtomsCalculation<T>::AtomsCalculation(boost::function<T(atom*)> _op,std::string name,AtomDescriptor _descr) :
   Calculation<std::vector<T> >(0,name,false),
-  op(_op),
-  descr(_descr)
+  descr(_descr),
+  op(_op)
 {}
 
@@ -29 +29 @@
 template<typename T>
 std::vector<T>* AtomsCalculation<T>::doCalc(){
-  World* world = World::get();
+  World* world = World::getPointer();
   int steps = world->numAtoms();
-  int count = 0;
   std::vector<T> *res = new std::vector<T>();
   res->reserve(steps);
   Process::setMaxSteps(steps);
   Process::start();
-  World::AtomIterator iter;
-  for(iter=world->getAtomIter(descr);iter!=world->atomEnd();++iter){
+  for(World::AtomIterator iter=world->getAtomIter(descr);iter!=world->atomEnd();++iter){
     Process::setCurrStep(iter.getCount());
     res->push_back(op(*iter));