mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Some missing from merge.
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
parent
ec939a5bce
commit
f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
|
|
@ -1,3 +1,5 @@
|
|||
// $Id: Unbounded_Set_Ex.cpp 96985 2013-04-11 15:50:32Z huangh $
|
||||
|
||||
#ifndef ACE_UNBOUNDED_SET_EX_CPP
|
||||
#define ACE_UNBOUNDED_SET_EX_CPP
|
||||
|
||||
|
|
@ -15,7 +17,7 @@
|
|||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex)
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex)
|
||||
|
||||
template <class T, class C> size_t
|
||||
ACE_Unbounded_Set_Ex<T, C>::size (void) const
|
||||
|
|
@ -226,7 +228,7 @@ ACE_Unbounded_Set_Ex<T, C>::remove (const T &item)
|
|||
{
|
||||
// ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::remove");
|
||||
|
||||
// Insert the item to be found into the dummy node.
|
||||
// Insert the item to be founded into the dummy node.
|
||||
this->head_->item_ = item;
|
||||
|
||||
NODE *curr = this->head_;
|
||||
|
|
@ -234,11 +236,6 @@ ACE_Unbounded_Set_Ex<T, C>::remove (const T &item)
|
|||
while (!(this->comp_ (curr->next_->item_, item)))
|
||||
curr = curr->next_;
|
||||
|
||||
// reset the dummy node. This ensures reference counted items are
|
||||
// completely released. Without this, a reference can linger as
|
||||
// the dummy long after it was removed from the list.
|
||||
this->head_->item_ = T();
|
||||
|
||||
if (curr->next_ == this->head_)
|
||||
return -1; // Item was not found.
|
||||
else
|
||||
|
|
@ -283,7 +280,7 @@ ACE_Unbounded_Set_Ex<T, C>::end (void) const
|
|||
return const_iterator (*this, 1);
|
||||
}
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex_Iterator)
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Iterator)
|
||||
|
||||
template <class T, class C> void
|
||||
ACE_Unbounded_Set_Ex_Iterator<T, C>::dump (void) const
|
||||
|
|
@ -390,7 +387,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator!= (const ACE_Unbounded_Set_Ex_Iter
|
|||
return (this->set_ != rhs.set_ || this->current_ != rhs.current_);
|
||||
}
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex_Const_Iterator)
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Const_Iterator)
|
||||
|
||||
template <class T, class C> void
|
||||
ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump (void) const
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue