X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FVariantParser.test.cc;h=364349e63aa199c7883debf0f6c34c19a98b4f3c;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=d330e5a4f081d80c63fb6e98d2dad2705e8b6c28;hpb=0b019beda0f10ad880b3c08bae2851ca5b5d909e;p=senf.git

diff --git a/Packets/VariantParser.test.cc b/Packets/VariantParser.test.cc
index d330e5a..364349e 100644
--- a/Packets/VariantParser.test.cc
+++ b/Packets/VariantParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief VariantParser.test unit tests */
+    \brief VariantParser unit tests */
 
 //#include "VariantParser.test.hh"
 //#include "VariantParser.test.ih"
@@ -78,7 +78,10 @@ BOOST_AUTO_UNIT_TEST(VariantParser)
     };
 }
 
-namespace {
+// We can't use the unnamed namespace here since there's a bug in gcc-4.2.3 which is 
+// the default version of gcc on ubuntu hardy :-(
+// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34213
+namespace VariantParser_test_cc_anon_namespace {
     
     struct SubParser : public senf::PacketParserBase
     { 
@@ -94,17 +97,25 @@ namespace {
     {
 #       include SENF_PARSER()
 
-        SENF_PARSER_SKIP_BITS( 4 );
+        SENF_PARSER_BITFIELD_RO( len,  4, unsigned );
         SENF_PARSER_BITFIELD_RO( type, 4, unsigned );
-        SENF_PARSER_PRIVATE_VARIANT( content_, type,
-                                         ( novalue( nocontent, key(10, senf::VoidPacketParser)) )
-                                         (      id( content,           SubParser              ) )
+        // just here so the second variant is 'var'
+        SENF_PARSER_VARIANT( value, len, 
+                                 (senf::VoidPacketParser)
+                                 (senf::UInt8Parser)
+                                 (senf::UInt16Parser)
+                                 (senf::UInt32Parser)
+            );
+        SENF_PARSER_VARIANT( content_, type,
+                                 ( novalue( nocontent, key(10, senf::VoidPacketParser) ) )
+                                 (      id( content,           SubParser               ) )
             );
 
         SENF_PARSER_FINALIZE(TestParser);
     };
     
 }
+using namespace VariantParser_test_cc_anon_namespace;
 
 BOOST_AUTO_UNIT_TEST(VariantParserMacro)
 {