| cacheset.h | | cacheset.h | |
| | | | |
| skipping to change at line 189 | | skipping to change at line 189 | |
| friend std::ostream& operator<<(std::ostream& out, const_ite
rator i) { return operator<<(out, *i); } | | friend std::ostream& operator<<(std::ostream& out, const_ite
rator i) { return operator<<(out, *i); } | |
| }; | | }; | |
| class iterator : public PackageContainerInterface::const_iterator, | | class iterator : public PackageContainerInterface::const_iterator, | |
| public std::iterator<std::forward_iterator_tag, typ
ename Container::iterator> { | | public std::iterator<std::forward_iterator_tag, typ
ename Container::iterator> { | |
| typename Container::iterator _iter; | | typename Container::iterator _iter; | |
| public: | | public: | |
| iterator(typename Container::iterator i) : _iter(i) {} | | iterator(typename Container::iterator i) : _iter(i) {} | |
| pkgCache::PkgIterator getPkg(void) const { return *_iter; } | | pkgCache::PkgIterator getPkg(void) const { return *_iter; } | |
| inline pkgCache::PkgIterator operator*(void) const { return
*_iter; }; | | inline pkgCache::PkgIterator operator*(void) const { return
*_iter; }; | |
| operator typename Container::iterator(void) const { return _
iter; } | | operator typename Container::iterator(void) const { return _
iter; } | |
|
| operator typename PackageContainer<Container>::const_iterato
r() { return PackageContainer<Container>::const_iterator(_iter); } | | operator typename PackageContainer<Container>::const_iterato
r() { return typename PackageContainer<Container>::const_iterator(_iter); } | |
| inline iterator& operator++() { ++_iter; return *this; } | | inline iterator& operator++() { ++_iter; return *this; } | |
| inline iterator operator++(int) { iterator tmp(*this); opera
tor++(); return tmp; } | | inline iterator operator++(int) { iterator tmp(*this); opera
tor++(); return tmp; } | |
| inline bool operator!=(iterator const &i) const { return _it
er != i._iter; }; | | inline bool operator!=(iterator const &i) const { return _it
er != i._iter; }; | |
| inline bool operator==(iterator const &i) const { return _it
er == i._iter; }; | | inline bool operator==(iterator const &i) const { return _it
er == i._iter; }; | |
| inline iterator& operator=(iterator const &i) { _iter = i._i
ter; return *this; }; | | inline iterator& operator=(iterator const &i) { _iter = i._i
ter; return *this; }; | |
| inline iterator& operator=(typename Container::iterator cons
t &i) { _iter = i; return *this; }; | | inline iterator& operator=(typename Container::iterator cons
t &i) { _iter = i; return *this; }; | |
| friend std::ostream& operator<<(std::ostream& out, iterator
i) { return operator<<(out, *i); } | | friend std::ostream& operator<<(std::ostream& out, iterator
i) { return operator<<(out, *i); } | |
| }; | | }; | |
| /*}}
}*/ | | /*}}
}*/ | |
| | | | |
| | | | |
| skipping to change at line 508 | | skipping to change at line 508 | |
| friend std::ostream& operator<<(std::ostream& out, const_ite
rator i) { return operator<<(out, *i); } | | friend std::ostream& operator<<(std::ostream& out, const_ite
rator i) { return operator<<(out, *i); } | |
| }; | | }; | |
| class iterator : public VersionContainerInterface::const_iterator, | | class iterator : public VersionContainerInterface::const_iterator, | |
| public std::iterator<std::forward_iterator_tag, typ
ename Container::iterator> { | | public std::iterator<std::forward_iterator_tag, typ
ename Container::iterator> { | |
| typename Container::iterator _iter; | | typename Container::iterator _iter; | |
| public: | | public: | |
| iterator(typename Container::iterator i) : _iter(i) {} | | iterator(typename Container::iterator i) : _iter(i) {} | |
| pkgCache::VerIterator getVer(void) const { return *_iter; } | | pkgCache::VerIterator getVer(void) const { return *_iter; } | |
| inline pkgCache::VerIterator operator*(void) const { return
*_iter; }; | | inline pkgCache::VerIterator operator*(void) const { return
*_iter; }; | |
| operator typename Container::iterator(void) const { return _
iter; } | | operator typename Container::iterator(void) const { return _
iter; } | |
|
| operator typename VersionContainer<Container>::const_iterato
r() { return VersionContainer<Container>::const_iterator(_iter); } | | operator typename VersionContainer<Container>::const_iterato
r() { return typename VersionContainer<Container>::const_iterator(_iter); } | |
| inline iterator& operator++() { ++_iter; return *this; } | | inline iterator& operator++() { ++_iter; return *this; } | |
| inline iterator operator++(int) { iterator tmp(*this); opera
tor++(); return tmp; } | | inline iterator operator++(int) { iterator tmp(*this); opera
tor++(); return tmp; } | |
| inline bool operator!=(iterator const &i) const { return _it
er != i._iter; }; | | inline bool operator!=(iterator const &i) const { return _it
er != i._iter; }; | |
| inline bool operator==(iterator const &i) const { return _it
er == i._iter; }; | | inline bool operator==(iterator const &i) const { return _it
er == i._iter; }; | |
| inline iterator& operator=(iterator const &i) { _iter = i._i
ter; return *this; }; | | inline iterator& operator=(iterator const &i) { _iter = i._i
ter; return *this; }; | |
| inline iterator& operator=(typename Container::iterator cons
t &i) { _iter = i; return *this; }; | | inline iterator& operator=(typename Container::iterator cons
t &i) { _iter = i; return *this; }; | |
| friend std::ostream& operator<<(std::ostream& out, iterator
i) { return operator<<(out, *i); } | | friend std::ostream& operator<<(std::ostream& out, iterator
i) { return operator<<(out, *i); } | |
| }; | | }; | |
| /*}}
}*/ | | /*}}
}*/ | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|