Adjustment and fixes for boost-1.36 support

[senf.git] / Packets / PacketImpl.hh

diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index 667eebb..32ae5a1 100644 (file)
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketImpl public header */
 
-#ifndef HH_PacketImpl_
-#define HH_PacketImpl_ 1
+#ifndef HH_SENF_Packets_PacketImpl_
+#define HH_SENF_Packets_PacketImpl_ 1
 
 // Custom includes
 #include <memory>
@@ -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>
@@ -183,6 +185,9 @@ namespace detail {
         void erase(PacketData * self, iterator first, iterator last);
         void clear(PacketData * self);
 
+        void reserve(size_type n);
+        size_type capacity() const;
+
         // Annotations
         template <class Annotation>
         Annotation & annotation();
@@ -217,8 +222,8 @@ namespace detail {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketImpl_i_)
-#define HH_PacketImpl_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketImpl_i_)
+#define HH_SENF_Packets_PacketImpl_i_
 #include "PacketImpl.cci"
 //#include "PacketImpl.ct"
 #include "PacketImpl.cti"