* apt-pkg/cacheiterator.h:

  - let pkgCache::Iterator inherent std::iterator

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index e2ca746838ce075977406c5d669607efc39504f7..3d58f7ec0218ac9ace3082ed2e220fa78a57b3ba 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -29,10 +29,12 @@
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H

+#include<iterator>

 // abstract Iterator template                                          /*{{{*/
 /* This template provides the very basic iterator methods we
    need to have for doing some walk-over-the-cache magic */
 // abstract Iterator template                                          /*{{{*/
 /* This template provides the very basic iterator methods we
    need to have for doing some walk-over-the-cache magic */

-template<typename Str, typename Itr> class pkgCache::Iterator {
+template<typename Str, typename Itr> class pkgCache::Iterator :
+                       public std::iterator<std::forward_iterator_tag, Str> {

        protected:
        Str *S;
        pkgCache *Owner;
        protected:
        Str *S;
        pkgCache *Owner;

diff --git a/debian/changelog b/debian/changelog
index 1fa254b0d802ba67397f5c0eb12bac8d30f6cd88..839c8c80015feff910b6e47720c52adcf83d54c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low
     - add a constant Exists check for MetaKeys
   * apt-pkg/acquire-item.cc:
     - do not try PDiff if it is not listed in the Meta file
     - add a constant Exists check for MetaKeys
   * apt-pkg/acquire-item.cc:
     - do not try PDiff if it is not listed in the Meta file

+  * apt-pkg/cacheiterator.h:
+    - let pkgCache::Iterator inherent std::iterator

 
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 29 May 2010 12:03:20 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 29 May 2010 15:39:07 +0200

 
 apt (0.7.26~exp5) experimental; urgency=low
 
 
 apt (0.7.26~exp5) experimental; urgency=low