X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketData.hh;h=3bcb5220a5177bb67b80abf613919c5fc2b40b85;hb=10e64c7a79dcb1f1438dca8c1a949057cdcc7394;hp=8365924b2c1209f41db7d6bc51f7dd7bafce48ff;hpb=8d2d26f114d3df0a60c5c516fcf40671b1e55558;p=senf.git

diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh
index 8365924..3bcb522 100644
--- a/Packets/PacketData.hh
+++ b/Packets/PacketData.hh
@@ -28,7 +28,7 @@
 #include <boost/utility.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include "../Utils/SafeBool.hh"
+#include "../Utils/safe_bool.hh"
 #include "PacketTypes.hh"
 
 //#include "PacketData.mpp"
@@ -175,7 +175,7 @@ namespace senf {
         : public boost::iterator_facade< safe_data_iterator,
                                          PacketData::value_type,
                                          boost::random_access_traversal_tag >,
-          public ComparableSafeBool<safe_data_iterator>
+          public comparable_safe_bool<safe_data_iterator>
     {
     public:
         typedef PacketData::size_type size_type;
@@ -225,7 +225,7 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(SENF_PACKETS_DECL_ONLY) && !defined(HH_PacketData_i_)
+#if !defined(HH_Packets__decls_) && !defined(HH_PacketData_i_)
 #define HH_PacketData_i_
 #include "PacketData.cci"
 //#include "PacketData.ct"