Packets: Fix VariantParser invalid parser access bug

[senf.git] / Packets / PacketRegistry.hh

diff --git a/Packets/PacketRegistry.hh b/Packets/PacketRegistry.hh
index 8f342eb..1fa7d99 100644 (file)
--- a/Packets/PacketRegistry.hh
+++ b/Packets/PacketRegistry.hh
@@ -23,13 +23,14 @@
 /** \file
     \brief PacketRegistry public header */
 
-#ifndef HH_PacketRegistryImpl_
-#define HH_PacketRegistryImpl_ 1
+#ifndef HH_SENF_Packets_PacketRegistry_
+#define HH_SENF_Packets_PacketRegistry_ 1
 
 // Custom includes
 #include <map>
 #include <boost/utility.hpp> // for boost::noncopyable
 #include <boost/optional.hpp>
+#include <boost/preprocessor/cat.hpp>
 #include "../Utils/Exception.hh"
 #include "Packet.hh"
 
@@ -200,7 +201,7 @@ packet of which the key is requested
 #   define SENF_PACKET_REGISTRY_REGISTER( registry, value, type )                                 \
         namespace {                                                                               \
             senf::PacketRegistry< registry >::RegistrationProxy< type >                           \
-                packetRegistration_ ## __LINE__ ( value );                                        \
+                BOOST_PP_CAT(packetRegistration_, __LINE__) ( value );                            \
         }
 
     /** \brief Dump all packet registries
@@ -221,8 +222,8 @@ packet of which the key is requested
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketRegistryImpl_i_)
-#define HH_PacketRegistryImpl_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketRegistry_i_)
+#define HH_SENF_Packets_PacketRegistry_i_
 #include "PacketRegistry.cci"
 #include "PacketRegistry.ct"
 #include "PacketRegistry.cti"