Adjustment and fixes for boost-1.36 support

[senf.git] / Packets / PacketImpl.hh

diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index de52e40..32ae5a1 100644 (file)
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -97,6 +97,7 @@ namespace detail {
         static bool const Complex = boost::is_base_of<ComplexAnnotation, Annotation>::value;
         static bool const Small = (sizeof(Annotation) <= sizeof(AnnotationEntry) && ! Complex);
 
+#       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<Annotation>::value 
@@ -104,6 +105,7 @@ namespace detail {
                               || Complex ));
 
 #       endif
+#       endif
     };
 
     template <class Annotation, bool Small = AnnotationIndexer<Annotation>::Small>