X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2Fintrusive_refcount.cci;h=7ac3df2d573cdf0ee2f15588ad987eb99aa5818a;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=b89a6f4dfd19e750ef84d161c352984f6118d6dc;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git diff --git a/Utils/intrusive_refcount.cci b/Utils/intrusive_refcount.cci index b89a6f4..7ac3df2 100644 --- a/Utils/intrusive_refcount.cci +++ b/Utils/intrusive_refcount.cci @@ -1,9 +1,9 @@ // $Id$ // // Copyright (C) 2006 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund // // 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 @@ -26,49 +26,38 @@ //#include "intrusive_refcount.ih" // Custom includes -#include +#include "senfassert.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// -prefix_ senf::intrusive_refcount::refcount_t senf::intrusive_refcount::refcount() +prefix_ senf::intrusive_refcount_base::refcount_t senf::intrusive_refcount_base::refcount() { return refcount_; } -prefix_ bool senf::intrusive_refcount::is_shared() +prefix_ bool senf::intrusive_refcount_base::is_shared() { return refcount()>1; } -prefix_ senf::intrusive_refcount::intrusive_refcount() +prefix_ senf::intrusive_refcount_base::intrusive_refcount_base() : refcount_(0) {} -prefix_ senf::intrusive_refcount::~intrusive_refcount() -{} - -prefix_ void senf::intrusive_refcount::add_ref() +prefix_ void senf::intrusive_refcount_base::add_ref() { ++refcount_; } -prefix_ bool senf::intrusive_refcount::release() +prefix_ bool senf::intrusive_refcount_base::release() { - BOOST_ASSERT(refcount_>0); + SENF_ASSERT(refcount_>0); return --refcount_ == 0; } -prefix_ void senf::intrusive_ptr_add_ref(intrusive_refcount* p) -{ - p->add_ref(); -} - -prefix_ void senf::intrusive_ptr_release(intrusive_refcount* p) -{ - if (p->release()) - delete p; -} +prefix_ senf::intrusive_refcount::intrusive_refcount() +{} ///////////////////////////////cci.e/////////////////////////////////////// #undef prefix_