//
// Copyright (C) 2009
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// Thorsten Horstmann <tho@berlios.de>
//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Thorsten Horstmann <tho@berlios.de>
/** \file
\brief GenericTLV non-inline template implementation */
#include <senf/Utils/Format.hh>
#define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::GenericTLVParserBase<Base>
template <class Base>
template <class Parser>
prefix_ Parser senf::GenericTLVParserBase<Base>::init()
{
- senf::PacketParserBase::size_type oldSize (bytes() );
- senf::PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
+ PacketParserBase::size_type oldSize (bytes() );
+ PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
this->resize( oldSize, newParserSize);
std::fill(this->i(), boost::next(this->i(), newParserSize), 0u);
Parser concreteParser = Parser(this->i(), this->state() );
} else {
boost::io::ios_all_saver ias(os);
os << " GenericTLVParser<" << prettyName(typeid(Base)) << ">\n"
- << " type: " << senf::format::dumpint(this->type()) << "\n"
- << " length: " << senf::format::dumpint(this->length()) << "\n"
+ << " type: " << format::dumpint(this->type()) << "\n"
+ << " length: " << format::dumpint(this->length()) << "\n"
<< " value:\n";
hexdump(value().begin(), value().end(), os);
}
prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
const
{
- senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
+ PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
}
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::GenericTLVParserRegistry<BaseParser,Keytype>
template <class BaseParser, class Keytype>
map_.insert(key, new detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>() );
}
+// Wow ... this is stupid .. Boost 1.33 ptr_map API is broken ...
+
+#if BOOST_VERSION < 103400
+#define PTRMAP_GET_CONTENTS(v) (v)
+#else
+#define PTRMAP_GET_CONTENTS(v) (*(v).second)
+#endif
+
template <class BaseParser, class Keytype>
prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
GenericTLVParser const & parser, std::ostream & os)
{
typename Map::const_iterator i (map_.find( parser.type()));
if (i != map_.end())
- (i->second)->dump(parser, os);
+ PTRMAP_GET_CONTENTS(*i).dump(parser, os);
}
template <class BaseParser, class Keytype>
{
typename Map::const_iterator i (map_.find( key));
if (i != map_.end())
- (i->second)->dump(parser, os);
+ PTRMAP_GET_CONTENTS(*i).dump(parser, os);
}
template <class BaseParser, class Keytype>
{
typename Map::const_iterator i (map_.find( parser.type()));
if (i != map_.end())
- return (i->second)->bytes(parser);
+ return PTRMAP_GET_CONTENTS(*i).bytes(parser);
else
throw TLVParserNotRegisteredException();
}
{
typename Map::const_iterator i (map_.find( key));
if (i != map_.end())
- return (i->second)->bytes(parser);
+ return PTRMAP_GET_CONTENTS(*i).bytes(parser);
else
throw TLVParserNotRegisteredException();
}
+#undef PTRMAP_GET_CONTENTS
-
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f
projects / senf.git / blobdiff