Changeset 025ca2 for molecuilder/src/World.hpp

Timestamp:

Mar 4, 2010, 4:03:57 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

4c60ef, fd9d77

Parents:

f058ef

Message:

Made the World Iterators conform to STL-Structure

File:

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

molecuilder/src/World.hpp

@@ -151 +151 @@
   // Atoms
 
-  class AtomIterator {
+  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>
+  {
   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*);
@@ -191 +205 @@
   // Molecules
 
-  class MoleculeIterator {
+  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>
+  {
   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*);