X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.ct;h=2153937a970b946cfb69d315ac49f5359007ed2f;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=28ae2be310b1abcd99f288ee239579e764577d06;hpb=0f235de98cae838afb42244ebd307ce8cd1db409;p=senf.git

diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct
index 28ae2be..2153937 100644
--- a/senf/Packets/GenericTLV.ct
+++ b/senf/Packets/GenericTLV.ct
@@ -40,7 +40,7 @@
 template <class Base>
 template <class Parser>
 prefix_ Parser senf::GenericTLVParserBase<Base>::init()
-{  
+{
     senf::PacketParserBase::size_type oldSize (bytes() );
     senf::PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
     this->resize(  oldSize, newParserSize);
@@ -53,7 +53,7 @@ prefix_ Parser senf::GenericTLVParserBase<Base>::init()
 
 template <class Base>
 prefix_  void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
-    const 
+    const
 {
     if (Base::Registry::instance().isRegistered( *this)) {
         Base::Registry::instance().dump( *this, os);
@@ -68,8 +68,8 @@ prefix_  void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
 }
 
 template <class Base>
-prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value() 
-    const 
+prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+    const
 {
     senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
     return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
@@ -102,6 +102,14 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::registerParser(
         map_.insert(key, new detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>() );
 }
 
+// Wow ... this is stupid .. Boost 1.33 ptr_map API is broken ...
+
+#if BOOST_VERSION < 103400
+#define PTRMAP_GET_CONTENTS(v) (v)
+#else
+#define PTRMAP_GET_CONTENTS(v) (*(v).second)
+#endif
+
 template <class BaseParser, class Keytype>
 prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
         GenericTLVParser const & parser, std::ostream & os)
@@ -109,7 +117,7 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
 {
     typename Map::const_iterator i (map_.find( parser.type()));
     if (i != map_.end())
-        (i->second)->dump(parser, os);
+        PTRMAP_GET_CONTENTS(*i).dump(parser, os);
 }
 
 template <class BaseParser, class Keytype>
@@ -119,7 +127,7 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
 {
     typename Map::const_iterator i (map_.find( key));
     if (i != map_.end())
-        (i->second)->dump(parser, os);
+        PTRMAP_GET_CONTENTS(*i).dump(parser, os);
 }
 
 template <class BaseParser, class Keytype>
@@ -129,12 +137,24 @@ prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BasePar
 {
     typename Map::const_iterator i (map_.find( parser.type()));
     if (i != map_.end())
-        return (i->second)->bytes(parser);
+        return PTRMAP_GET_CONTENTS(*i).bytes(parser);
+    else
+        throw TLVParserNotRegisteredException();
+}
+
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+        GenericTLVParser const & parser, Keytype const & key)
+    const
+{
+    typename Map::const_iterator i (map_.find( key));
+    if (i != map_.end())
+        return PTRMAP_GET_CONTENTS(*i).bytes(parser);
     else
         throw TLVParserNotRegisteredException();
 }
 
-        
+#undef PTRMAP_GET_CONTENTS
 
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_