minor fixes for clang++

[senf.git] / senf / Packets / 80211Bundle / RadiotapPacket.hh

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh
index c1e9a91..04e1f9c 100644 (file)
--- a/senf/Packets/80211Bundle/RadiotapPacket.hh
+++ b/senf/Packets/80211Bundle/RadiotapPacket.hh
@@ -58,7 +58,7 @@ namespace senf {
 
         SENF_PARSER_FINALIZE ( RadiotapPacketParser_Flags );
 
-        friend class RadiotapPacketParser;
+        friend struct RadiotapPacketParser;
     };
 
     /** \brief Parse in Radiotap Header channel frequency and flag field
@@ -271,6 +271,7 @@ namespace senf {
         static const size_type fixed_bytes = 0; // hide this member, just in case
 
         typedef boost::array<size_type,MAX_INDEX+2> OffsetTable;
+        typedef std::map<boost::uint32_t, OffsetTable> OffsetMap;
 
         //-////////////////////////////////////////////////////////////////////////
         // Offset table handling
@@ -296,9 +297,10 @@ namespace senf {
         void updatePresentFlags(boost::uint32_t flags);
         void insertRemoveBytes(unsigned from, unsigned to, int bytes);
 
+        static OffsetMap offsetMap_;
         OffsetTable const * currentTable_;
 
-        friend class RadiotapPacketType;
+        friend struct RadiotapPacketType;
     };
 
     /** \brief Radiotap packet
@@ -327,7 +329,7 @@ namespace senf {
         static void init(packet p);
         static void dump(packet p, std::ostream & os);
         static factory_t nextPacketType(packet p);
-        static optional_range nextPacketRange(packet p);
+        static optional_range nextPacketRange(packet const & p);
     };
 
     typedef ConcretePacket<RadiotapPacketType> RadiotapPacket;