Changes in src/World.hpp [31af19:88d586]

File:

• src/World.hpp (modified) (2 diffs)

src/World.hpp

@@ -151 +151 @@
   // Atoms
 
-  class AtomIterator :
-    public std::iterator<std::iterator_traits<AtomSet::iterator>::difference_type,
-                         std::iterator_traits<AtomSet::iterator>::value_type,
-                         std::iterator_traits<AtomSet::iterator>::pointer,
-                         std::iterator_traits<AtomSet::iterator>::reference>
-  {
+  class AtomIterator {
   public:
-
-    typedef AtomSet::iterator _Iter;
-    typedef _Iter::value_type value_type;
-    typedef _Iter::difference_type difference_type;
-    typedef _Iter::pointer pointer;
-    typedef _Iter::reference reference;
-    typedef _Iter::iterator_category iterator_category;
-
-
     AtomIterator();
     AtomIterator(AtomDescriptor, World*);
@@ -205 +191 @@
   // Molecules
 
-  class MoleculeIterator :
-    public std::iterator<std::iterator_traits<MoleculeSet::iterator>::difference_type,
-                         std::iterator_traits<MoleculeSet::iterator>::value_type,
-                         std::iterator_traits<MoleculeSet::iterator>::pointer,
-                         std::iterator_traits<MoleculeSet::iterator>::reference>
-  {
+  class MoleculeIterator {
   public:
-
-    typedef MoleculeSet::iterator _Iter;
-    typedef _Iter::value_type value_type;
-    typedef _Iter::difference_type difference_type;
-    typedef _Iter::pointer pointer;
-    typedef _Iter::reference reference;
-    typedef _Iter::iterator_category iterator_category;
-
     MoleculeIterator();
     MoleculeIterator(MoleculeDescriptor, World*);