Changeset 5738177 for molecuilder/src/Descriptors

Timestamp:

Mar 17, 2010, 3:19:56 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

43ed42

Parents:

d639c7

git-author:

Tillmann Crueger <crueger@…> (03/17/10 14:53:26)

git-committer:

Tillmann Crueger <crueger@…> (03/17/10 15:19:56)

Message:

Added a generic Iterator that can be used to iterate only over certain parts of an internal data structure

Location:

molecuilder/src/Descriptors

Files:

• AtomDescriptor.hpp (modified) (1 diff)
• DescriptorBase.hpp (added)
• DescriptorBase_impl.hpp (added)
• MoleculeDescriptor.hpp (modified) (2 diffs)
• SelectiveIterator.hpp (added)
• SelectiveIterator_impl.hpp (added)

molecuilder/src/Descriptors/AtomDescriptor.hpp

@@ -36 +36 @@
   friend atom* World::getAtom(AtomDescriptor descriptor);
   friend std::vector<atom*> World::getAllAtoms(AtomDescriptor descriptor);
-  friend class World::AtomIterator;
+  template <class,class,class> friend class SelectiveIterator;
 
   friend AtomDescriptor operator&&(const AtomDescriptor &lhs, const AtomDescriptor &rhs);

molecuilder/src/Descriptors/MoleculeDescriptor.hpp

@@ -36 +36 @@
   friend molecule* World::getMolecule(MoleculeDescriptor descriptor);
   friend std::vector<molecule*> World::getAllMolecules(MoleculeDescriptor descriptor);
-  friend class World::MoleculeIterator;
+  template <class,class,class> friend class SelectiveIterator;
 
   friend MoleculeDescriptor operator&&(const MoleculeDescriptor &lhs, const MoleculeDescriptor &rhs);
@@ -43 +43 @@
 
 public:
-  typedef boost::shared_ptr<MoleculeDescriptor_impl> impl_ptr; //!< Allow easy changes of the pointer-to-implementation type
+  typedef MoleculeDescriptor_impl impl_t;
+  typedef boost::shared_ptr<impl_t> impl_ptr; //!< Allow easy changes of the pointer-to-implementation type
 
   MoleculeDescriptor(impl_ptr);