Move the values_iterator typedef to the top of the class, make it public, and define it in terms of the collection typedef.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/generic/util/dynamic_set_union.h b/src/generic/util/dynamic_set_union.h
index d8cc5d01..19de891c 100644
--- a/src/generic/util/dynamic_set_union.h
+++ b/src/generic/util/dynamic_set_union.h
@@ -190,9 +190,13 @@ namespace aptitude
     class dynamic_set_union<T>::set_enumerator
       : public enumerator<T>
     {
-      boost::shared_ptr<dynamic_set<T> > parent;
-      typedef typename boost::unordered_map<T, int>::const_iterator values_iterator;
+    public:
+      typedef
+      typename dynamic_set_union<T>::value_counts_t::const_iterator
+      values_iterator;
 
+    private:
+      boost::shared_ptr<dynamic_set<T> > parent;
       values_iterator begin, end;
       bool is_first;