X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.cc;h=f9c598f8de604be939e66a61799768e88bf56d08;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=9444ab7c753026852a5985f6aaef7747e5350511;hpb=20c3dbf64b3beed10655dceaee5791680fb25383;p=senf.git

diff --git a/senf/Packets/PacketImpl.cc b/senf/Packets/PacketImpl.cc
index 9444ab7..f9c598f 100644
--- a/senf/Packets/PacketImpl.cc
+++ b/senf/Packets/PacketImpl.cc
@@ -108,7 +108,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ
     // b) 'self'
     // c) Those that come afterwards
     // For a), the change must be inside the packet since 'self' must be within those packets
-    // For b), the change must also be within since that's the packet we are changeing
+    // For b), the change must also be within since that's the packet we are changing
     // For c), the change must be outside the packet (we don't allow an upper packet to mess with
     // the the data owned by a packet further down the chain). It can be before or after the
     // packet.
@@ -123,7 +123,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ
     interpreter_list::iterator const i_end (interpreters_.end());
     if (++i != i_end)
         if (pos <= difference_type(i->begin_))
-            // pos is before the packet, it must then be before all futher packets ...
+            // pos is before the packet, it must then be before all further packets ...
             for (; i != i_end; ++i) {
                 i->begin_ += n;
                 i->end_ += n;
@@ -146,13 +146,9 @@ prefix_ void senf::detail::PacketImpl::dumpAnnotations(std::ostream & os)
 prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::key_type key)
 {
     SENF_ASSERT( key < 0, "complexAnnotation called with invalid key");
-#ifdef SENF_PACKET_NO_COMPLEX_ANNOTATIONS
-    return 0;
-#else
     return (ComplexAnnotations::size_type(-key-1) >= complexAnnotations_.size()
             || complexAnnotations_.is_null(-key-1))
         ? 0 : complexAnnotations_[-key-1].get();
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -160,7 +156,6 @@ prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::k
 
 prefix_ void senf::detail::AnnotationRegistry::dumpRegistrations(std::ostream & os)
 {
-#ifdef SENF_DEBUG
     boost::format fmt ("%-56.56s  %-4.4s  %-7.7s  %5d\n");
     os << "SENF_PACKET_ANNOTATION_SLOTS = " << SENF_PACKET_ANNOTATION_SLOTS << "\n"
        << "SENF_PACKET_ANNOTATION_SLOTSIZE = " << SENF_PACKET_ANNOTATION_SLOTSIZE << "\n";
@@ -176,7 +171,6 @@ prefix_ void senf::detail::AnnotationRegistry::dumpRegistrations(std::ostream &
             % (isComplex(key) ? "yes" : "no")
             % size(key);
     }
-#endif
 }
 
 prefix_ void senf::dumpPacketAnnotationRegistry(std::ostream & os)