X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketData.hh;h=05e5aa892b9d021110905d419ae9a836c6c50b8f;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=a2c1fa1af77ede4cba6c63c26dafe5bba83c20ce;hpb=0734bd14c709ca5ba1d0ed69c5b9f5d1487e5faa;p=senf.git

diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh
index a2c1fa1..05e5aa8 100644
--- a/Packets/PacketData.hh
+++ b/Packets/PacketData.hh
@@ -23,14 +23,14 @@
 /** \file
     \brief PacketData public header */
 
-#ifndef HH_PacketData_
-#define HH_PacketData_ 1
+#ifndef HH_SENF_Packets_PacketData_
+#define HH_SENF_Packets_PacketData_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/iterator/iterator_facade.hpp>
 #include "../Utils/safe_bool.hh"
+#include "../Utils/Exception.hh"
 #include "PacketTypes.hh"
 
 //#include "PacketData.mpp"
@@ -133,6 +133,9 @@ namespace senf {
         
         void resize(size_type n, byte v=0);
 
+        void reserve(size_type n);
+        size_type capacity() const;
+
         ///@}
 
     protected:
@@ -159,76 +162,15 @@ namespace senf {
         This exception is signaled whenever an operation tries to access an out-of-bounds data
         byte. If the packet has been implemented correctly, this signals a malformed packet.
      */
-    struct TruncatedPacketException : public std::exception
-    { virtual char const * what() const throw() { return "truncated packet"; } };
-
-    /** \brief Re-validating data iterator
-
-        This class is a wrapper around a PacketData::iterator instance. It will revalidate the
-        iterator on every access. This keeps the iterator valid even when the data container is
-        resized and thereby possibly relocated. The iterator will always point to the byte at the
-        same offset from the packets beginning. If data is inserted before this iterators position,
-        the data pointed to will of course change.
-
-        For this to work, the safe_data_iterator must be initialized with the container to which the
-        iterator belongs. After this initialization it can be used like any other iterator.
-     */
-    class safe_data_iterator
-        : public boost::iterator_facade< safe_data_iterator,
-                                         PacketData::value_type,
-                                         boost::random_access_traversal_tag >,
-          public comparable_safe_bool<safe_data_iterator>
-    {
-    public:
-        typedef PacketData::size_type size_type;
-
-        safe_data_iterator(); ///< Make uninitialized iterator
-        explicit safe_data_iterator(PacketData & data); 
-                                        ///< Construct iterator only setting the data container
-        safe_data_iterator(PacketData & data, PacketData::iterator i);
-                                        ///< Initialize iterator to given position
-        explicit safe_data_iterator(PacketParserBase const & parser);
-                                        ///< Initialize iterator from parser
-                                        /**< The iterator will point to the parsers start
-                                             position. */
-
-        safe_data_iterator & operator=(PacketData::iterator i); ///< Assign iterator
-                                        /**< The iteator \a i must be from the container wo which \c
-                                             this iterator has been initialized. */
-        safe_data_iterator & operator=(PacketParserBase const & parser);
-                                        ///< Assign iterator from parser
-                                        /**< The iterator will point to the parser start
-                                             position. */
+    struct TruncatedPacketException : public senf::Exception
+    { TruncatedPacketException() : senf::Exception("truncated packet"){} };
 
-        operator PacketData::iterator() const; ///< Convert to iterator
-
-        bool boolean_test() const;      ///< Check, if iterator is initialized
-
-        PacketData & data() const;      ///< Access data container
-
-    private:
-        friend class boost::iterator_core_access;
-
-        // iterator_facade interface
-
-        value_type & dereference() const;
-        bool equal(safe_data_iterator const & other) const;
-        difference_type distance_to(safe_data_iterator const & other) const;
-        void increment();
-        void decrement();
-        void advance(difference_type n);
-
-        PacketData::iterator i() const;
-
-        PacketData * data_;
-        size_type i_;
-    };
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketData_i_)
-#define HH_PacketData_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketData_i_)
+#define HH_SENF_Packets_PacketData_i_
 #include "PacketData.cci"
 //#include "PacketData.ct"
 #include "PacketData.cti"