//
// Copyright (C) 2007
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// Stefan Bund <g0dil@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):
+// Stefan Bund <g0dil@berlios.de>
/** \file
\brief PacketInterpreter inline non-template implementation */
// Custom includes
#include <senf/Utils/senfassert.hh>
-#include <boost/utility.hpp>
#define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::PacketInterpreterBase
// Structors and default members
+prefix_ senf::PacketInterpreterBase::~PacketInterpreterBase()
+{}
+
prefix_ senf::PacketInterpreterBase::factory_t senf::PacketInterpreterBase::no_factory()
{
return 0;
}
prefix_ senf::PacketInterpreterBase::ptr
-senf::PacketInterpreterBase::parseNextAs(factory_t factory)
+senf::PacketInterpreterBase::parseNextAs(factory_t factory, PacketInterpreterBase::optional_range const & range)
{
- return factory->parseNext(ptr(this));
+ return factory->parseNext(ptr(this), range);
}
// Data access
return v_nextPacketType();
}
-////////////////////////////////////////
+prefix_ void senf::PacketInterpreterBase::clearAnnotations()
+{
+ return impl().clearAnnotations();
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// protected members
// protected structors
return v_appendClone(impl,r);
}
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// private members
-// reference/memory management
-
-prefix_ void senf::PacketInterpreterBase::add_ref()
-{
- intrusive_refcount_t<PacketInterpreterBase>::add_ref();
- if (impl_)
- impl_->add_ref();
-}
-
-prefix_ bool senf::PacketInterpreterBase::release()
-{
- if (impl_)
- // This call will set impl_ to 0 if we just removed the last reference ...
- impl_->release();
- return intrusive_refcount_t<PacketInterpreterBase>::release() && !impl_;
-}
-
// containment management. Only to be called by PacketImpl.
prefix_ void senf::PacketInterpreterBase::assignImpl(detail::PacketImpl * impl)
{
SENF_ASSERT(!impl_, "Internal failure: PacketInterpreter added to two Packets");
impl_ = impl;
- impl_->add_ref(refcount());
+ if (refcount())
+ impl_->add_ref();
}
prefix_ void senf::PacketInterpreterBase::releaseImpl()
{
SENF_ASSERT(impl_, "Internal failure: release of lone PacketInterpreter");
- refcount_t refc (refcount());
- if (refc) {
- impl_->release(refc);
+ if (refcount()) {
+ detail::PacketImpl * i (impl_);
impl_ = 0;
+ // This call might delete this ...
+ i->release();
} else {
impl_ = 0;
delete this;
}
}
+prefix_ void senf::intrusive_ptr_add_ref(PacketInterpreterBase const * p)
+{
+ if (! p->refcount())
+ const_cast<PacketInterpreterBase *>(p)->add_ref();
+ else
+ const_cast<PacketInterpreterBase *>(p)->intrusive_refcount_base::add_ref();
+}
+
+prefix_ void senf::intrusive_ptr_release(PacketInterpreterBase const * p)
+{
+ if (p->refcount() <= 1)
+ const_cast<PacketInterpreterBase *>(p)->release();
+ else
+ const_cast<PacketInterpreterBase *>(p)->intrusive_refcount_base::release();
+}
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f