X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseArray.ih;h=9aa344b4696a644a49a799aba27cb8d0af1a315f;hb=65066c0e037d1de437d6121903e1dd511b41e940;hp=5ac5d033e4038833deb5ca1eb5bc580fcfb29f40;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Packets/ParseArray.ih b/Packets/ParseArray.ih
index 5ac5d03..9aa344b 100644
--- a/Packets/ParseArray.ih
+++ b/Packets/ParseArray.ih
@@ -28,35 +28,39 @@
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
-template <class Parser, class Iterator>
-class senf::impl::Parse_Array_iterator
-    : public boost::iterator_facade< Parse_Array_iterator<Parser,Iterator>,
-                                     Parser,
+template <class ElementParser>
+class senf::detail::Parse_Array_iterator
+    : public boost::iterator_facade< Parse_Array_iterator<ElementParser>,
+                                     ElementParser,
                                      boost::random_access_traversal_tag,
-                                     Parser >
+                                     ElementParser >
 {
 public:
     Parse_Array_iterator();
-    explicit Parse_Array_iterator(Iterator const & i);
+    Parse_Array_iterator(PacketParserBase::data_iterator const & i,
+                         PacketParserBase::state_type s);
 
     // Needed to elide the []-proxy of iterator_facade
-    Parser operator[](int i) const;
+    ElementParser operator[](int i) const;
 
-    Iterator raw() const;
+    PacketParserBase::data_iterator raw() const;
 
 protected:
 
 private:
     friend class boost::iterator_core_access;
+    
+    // iterator_facade interface
 
-    Parser dereference() const;
+    ElementParser dereference() const;
     bool equal(Parse_Array_iterator const & other) const;
     int distance_to(Parse_Array_iterator const & other) const;
     void increment();
     void decrement();
     void advance(int n);
 
-    Iterator i_;
+    PacketParserBase::data_iterator i_;
+    PacketParserBase::state_type s_;
 };
 
 ///////////////////////////////ih.e////////////////////////////////////////