Packets: Small bugfix to parser macros

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@471 270642c3-0616-0410-b53a-bc976706d245

diff --git a/Packets/ParseHelpers.ih b/Packets/ParseHelpers.ih
index 64fca3f..aca1f14 100644 (file)
--- a/Packets/ParseHelpers.ih
+++ b/Packets/ParseHelpers.ih
@@ -105,7 +105,7 @@
             BOOST_PP_CAT(SENF_PARSER_I_SIZE_, ofstype) (name, type),                              \
             BOOST_PP_CAT(SENF_PARSER_I_INITBYTES_, ofstype) (name, type),                         \
             access )                                                                              \
-        BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, ofstype, access)              \
+        BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, access)                       \
     public:
 #
 # ////////////////////////////////////////
@@ -186,7 +186,7 @@
             return parse<type>( SENF_PARSER_OFFSET(name) );                                       \
         }
 #
-# define SENF_PARSER_I_FIELD_VAL_ro(name, type, ofstype, access)                                  \
+# define SENF_PARSER_I_FIELD_VAL_ro(name, type, access)                                           \
         BOOST_PP_CAT(name, _t)::value_type name() const {                                         \
             return parse<type>( SENF_PARSER_OFFSET(name) ).value();                               \
         }
@@ -258,7 +258,7 @@
     private:                                                                                      \
          SENF_MPL_SLOT_SET(bitfield_size, BOOST_PP_CAT(name, _t)::fixed_bytes);                   \
     access:                                                                                       \
-         BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, ofstype, access)             \
+         BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, access)                      \
     public:
 #
 # ////////////////////////////////////////

diff --git a/senf.dict b/senf.dict
index 40b7ccc..e4106b2 100644 (file)
--- a/senf.dict
+++ b/senf.dict
@@ -22,6 +22,7 @@ aVectorCollection
 BaseParser
 berlios
 bitfield
+bool
 bund
 callback
 callbacks
@@ -44,6 +45,7 @@ ConnectedUDPv
 const
 createAfter
 createBefore
+DatagramSection
 DataPacket
 dd
 de
@@ -53,8 +55,11 @@ defaultInit
 defgroup
 deque
 dil
+dl
 DNS
 dontinclude
+DSMCCSection
+dt
 ElementParser
 endcode
 enum
@@ -91,6 +96,7 @@ findNext
 findPrev
 fixme
 fokus
+foo
 FooParser
 ForwardingRoute
 fraunhofer
@@ -141,11 +147,14 @@ ListN
 ListPolicy
 localhost
 loopback
+mac
 MACAddress
 mainpage
 mixin
+MPEGDVBBundle
 multicast
 MyList
+MyParser
 MyVector
 namespace
 nc
@@ -192,6 +201,7 @@ PacketTypeNotRegistered
 param
 ParseArray
 parsecollection
+ParseHelpers
 parseint
 ParseInt
 ParseList
@@ -199,6 +209,10 @@ ParseListB
 ParseListN
 parseNextAs
 parserlanguage
+parsermacrofields
+parsermacroinit
+parsermacrooffset
+parsermacrosbitfields
 ParseVec
 PassiveConnector
 PassiveInput
@@ -230,6 +244,7 @@ registerSomePacket
 RegistrationProxy
 rerference
 RFC
+RO
 RP
 SafePacketParser
 SatCom
@@ -237,6 +252,7 @@ Satelitenkommunikation
 scons
 ScopeId
 screenshot
+sec
 senf
 ServerSocketHandle
 setBegin
@@ -261,6 +277,7 @@ SomeParser
 SomeRegistryTag
 SomeTag
 someVector
+ssi
 std
 stefan
 STL
@@ -296,3 +313,4 @@ vlanId
 VLanId
 VoidPacketParser
 www
+xyz