From: g0dil Date: Wed, 7 Jan 2009 11:33:43 +0000 (+0000) Subject: Packets: BUGFIX: Fix VectorParser AuxPolicy access X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=f4f2847aa602668852935564ce6670e272c7b158;p=senf.git Packets: BUGFIX: Fix VectorParser AuxPolicy access git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1041 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Packets/VectorParser.cti b/Packets/VectorParser.cti index b7040bc..adcaec1 100644 --- a/Packets/VectorParser.cti +++ b/Packets/VectorParser.cti @@ -173,7 +173,7 @@ prefix_ void senf::VectorParser::resize(size_type n, Va template prefix_ senf::VectorParser_Container:: VectorParser_Container(parser_type const & vector) - : AuxPolicy(vector), state_ (vector.state()), + : AuxPolicy::WrapperPolicy(static_cast(vector)), state_ (vector.state()), i_ (std::distance(data().begin(),vector.i())) {} diff --git a/Packets/VectorParser.hh b/Packets/VectorParser.hh index 34b2c29..3ac2e44 100644 --- a/Packets/VectorParser.hh +++ b/Packets/VectorParser.hh @@ -129,7 +129,7 @@ namespace senf { */ template class VectorParser_Container - : private AuxPolicy + : private AuxPolicy::WrapperPolicy { public: /////////////////////////////////////////////////////////////////////////// diff --git a/Packets/VectorParser.test.cc b/Packets/VectorParser.test.cc index d827bc9..7e0d11d 100644 --- a/Packets/VectorParser.test.cc +++ b/Packets/VectorParser.test.cc @@ -262,9 +262,6 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_parse) BOOST_AUTO_UNIT_TEST(vectorMacro_create) { - /* - * This test fails with "... is an inaccessible base of ..." error - * see bugtracker @ berlios TestVectorPacket p (TestVectorPacket::create()); p->dummy() = 0x01020304u; p->vec1().push_back( 0x0506u); @@ -285,7 +282,6 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_create) 0x0D, 0x0E }; // vec2[1] BOOST_CHECK( equal( p.data().begin(), p.data().end(), data )); - */ } ///////////////////////////////cc.e////////////////////////////////////////