Fix package build

[senf.git] / senf / Packets / GenericTLV.ct

diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct
index e405ce7..2153937 100644 (file)
--- a/senf/Packets/GenericTLV.ct
+++ b/senf/Packets/GenericTLV.ct
@@ -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,7 +137,7 @@ 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();
 }
@@ -141,12 +149,12 @@ prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BasePar
 {
     typename Map::const_iterator i (map_.find( key));
     if (i != map_.end())
-        return (i->second)->bytes(parser);
+        return PTRMAP_GET_CONTENTS(*i).bytes(parser);
     else
         throw TLVParserNotRegisteredException();
 }
 
-
+#undef PTRMAP_GET_CONTENTS
 
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_