Provide access to underlying iterator

2 files changed, 18 insertions, 2 deletions

diff --git a/paludis/util/indirect_iterator-impl.hh b/paludis/util/indirect_iterator-impl.hh
index 6e4851dc7..0673997c5 100644
--- a/paludis/util/indirect_iterator-impl.hh
+++ b/paludis/util/indirect_iterator-impl.hh
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -82,6 +82,13 @@ namespace paludis
     }
 
     template <typename Iter_, typename Value_>
+    typename IndirectIterator<Iter_, Value_>::underlying_iterator_type
+    IndirectIterator<Iter_, Value_>::underlying_iterator()
+    {
+        return _iter;
+    }
+
+    template <typename Iter_, typename Value_>
     bool operator== (const IndirectIterator<Iter_, Value_> & lhs, const IndirectIterator<Iter_, Value_> & rhs)
     {
         return lhs._iter == rhs._iter;
diff --git a/paludis/util/indirect_iterator.hh b/paludis/util/indirect_iterator.hh
index 06d1d05a2..8b20d158b 100644
--- a/paludis/util/indirect_iterator.hh
+++ b/paludis/util/indirect_iterator.hh
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -104,6 +104,13 @@ namespace paludis
 
             ///\}
 
+            ///\name Additional typedefs
+            ///\{
+
+            typedef Iter_ underlying_iterator_type;
+
+            ///\}
+
             ///\name Increment
             ///\{
 
@@ -118,6 +125,8 @@ namespace paludis
             pointer operator-> () const;
             reference operator* () const;
 
+            underlying_iterator_type underlying_iterator();
+
             ///\}
     };