X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.hh;h=8c64647a9e7a7e826136529dbb7a481f1cbd2150;hb=cad7256a15fbec9b4bf38559e89db7e0fe814db0;hp=e0ab170097ca371a9e72fc615ac72a2dc133d39e;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Packets/PacketImpl.hh b/senf/Packets/PacketImpl.hh index e0ab170..8c64647 100644 --- a/senf/Packets/PacketImpl.hh +++ b/senf/Packets/PacketImpl.hh @@ -35,7 +35,6 @@ #include #include #include -#include "PacketTypes.hh" #include //#include "PacketImpl.mpp" @@ -92,8 +91,8 @@ namespace detail { }; template - struct AnnotationIndexer - : public senf::singleton< AnnotationIndexer >, + struct AnnotationIndexer + : public senf::singleton< AnnotationIndexer >, public AnnotationIndexerBase { AnnotationIndexer(); @@ -106,7 +105,7 @@ namespace detail { # if 0 // The test is difficult since it does not work with user-defined trivial constructors # ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS - BOOST_STATIC_ASSERT(( (boost::has_trivial_constructor::value + BOOST_STATIC_ASSERT(( (boost::has_trivial_constructor::value && boost::has_trivial_destructor::value) || Complex )); @@ -175,6 +174,7 @@ namespace detail { void appendInterpreter (PacketInterpreterBase * p); void prependInterpreter (PacketInterpreterBase * p); + void prependInterpreter (PacketInterpreterBase * p, PacketInterpreterBase * before); void truncateInterpreters (PacketInterpreterBase * p); void truncateInterpretersBackwards (PacketInterpreterBase * p); @@ -221,7 +221,7 @@ namespace detail { refcount_t refcount_; raw_container data_; interpreter_list interpreters_; - + typedef std::vector Annotations; Annotations annotations_;