X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.hh;h=8c64647a9e7a7e826136529dbb7a481f1cbd2150;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=e98a8c6f1eb265b4f05a604e03bec4a5e0497353;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Packets/PacketImpl.hh b/senf/Packets/PacketImpl.hh index e98a8c6..8c64647 100644 --- a/senf/Packets/PacketImpl.hh +++ b/senf/Packets/PacketImpl.hh @@ -91,8 +91,8 @@ namespace detail { }; template - struct AnnotationIndexer - : public senf::singleton< AnnotationIndexer >, + struct AnnotationIndexer + : public senf::singleton< AnnotationIndexer >, public AnnotationIndexerBase { AnnotationIndexer(); @@ -105,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 )); @@ -221,7 +221,7 @@ namespace detail { refcount_t refcount_; raw_container data_; interpreter_list interpreters_; - + typedef std::vector Annotations; Annotations annotations_;