*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 15:35:07 -07:00
parent f21f47005d
commit 26b5e033ff
2257 changed files with 750 additions and 103852 deletions
-77
View File
@@ -1,23 +1,19 @@
// -*- C++ -*-
//
// $Id: Containers_T.inl 80826 2008-03-04 14:51:23Z wotte $
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T> ACE_INLINE int
ACE_Bounded_Stack<T>::is_empty (void) const
{
ACE_TRACE ("ACE_Bounded_Stack<T>::is_empty");
return this->top_ == 0;
}
template <class T> ACE_INLINE int
ACE_Bounded_Stack<T>::is_full (void) const
{
ACE_TRACE ("ACE_Bounded_Stack<T>::is_full");
return this->top_ >= this->size_;
}
template <class T> ACE_INLINE int
ACE_Bounded_Stack<T>::push (const T &new_item)
{
@@ -30,7 +26,6 @@ ACE_Bounded_Stack<T>::push (const T &new_item)
else
return -1;
}
template <class T> ACE_INLINE int
ACE_Bounded_Stack<T>::pop (T &item)
{
@@ -43,7 +38,6 @@ ACE_Bounded_Stack<T>::pop (T &item)
else
return -1;
}
template <class T> ACE_INLINE int
ACE_Bounded_Stack<T>::top (T &item) const
{
@@ -56,29 +50,24 @@ ACE_Bounded_Stack<T>::top (T &item) const
else
return -1;
}
template <class T> ACE_INLINE size_t
ACE_Bounded_Stack<T>::size (void) const
{
return this->size_;
}
//----------------------------------------
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Stack<T, ACE_SIZE>::is_empty (void) const
{
ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::is_empty");
return this->top_ == 0;
}
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Stack<T, ACE_SIZE>::is_full (void) const
{
ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::is_full");
return this->top_ >= this->size_;
}
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Stack<T, ACE_SIZE>::push (const T &new_item)
{
@@ -91,7 +80,6 @@ ACE_Fixed_Stack<T, ACE_SIZE>::push (const T &new_item)
else
return -1;
}
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Stack<T, ACE_SIZE>::pop (T &item)
{
@@ -104,7 +92,6 @@ ACE_Fixed_Stack<T, ACE_SIZE>::pop (T &item)
else
return -1;
}
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Stack<T, ACE_SIZE>::top (T &item) const
{
@@ -117,20 +104,17 @@ ACE_Fixed_Stack<T, ACE_SIZE>::top (T &item) const
else
return -1;
}
template <class T, size_t ACE_SIZE> ACE_INLINE size_t
ACE_Fixed_Stack<T, ACE_SIZE>::size (void) const
{
return this->size_;
}
template <class T> ACE_INLINE int
ACE_Unbounded_Stack<T>::is_empty (void) const
{
// ACE_TRACE ("ACE_Unbounded_Stack<T>::is_empty");
return this->head_ == this->head_->next_;
}
template <class T> ACE_INLINE int
ACE_Unbounded_Stack<T>::top (T &item) const
{
@@ -143,103 +127,80 @@ ACE_Unbounded_Stack<T>::top (T &item) const
else
return -1;
}
template <class T> ACE_INLINE int
ACE_Unbounded_Stack<T>::is_full (void) const
{
ACE_TRACE ("ACE_Unbounded_Stack<T>::is_full");
return 0; // ???
}
template <class T> ACE_INLINE size_t
ACE_Unbounded_Stack<T>::size (void) const
{
return this->cur_size_;
}
// ---
// ---
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Set<T, ACE_SIZE>::is_empty (void) const
{
ACE_TRACE ("ACE_Fixed_Set<T>::is_empty");
return this->cur_size_ == 0;
}
template <class T, size_t ACE_SIZE> ACE_INLINE int
ACE_Fixed_Set<T, ACE_SIZE>::is_full (void) const
{
ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::is_full");
return this->cur_size_ == this->max_size_;
}
// ---
template <class T> ACE_INLINE int
ACE_Bounded_Set<T>::is_empty (void) const
{
ACE_TRACE ("ACE_Bounded_Set<T>::is_empty");
return this->cur_size_ == 0;
}
template <class T> ACE_INLINE int
ACE_Bounded_Set<T>::is_full (void) const
{
ACE_TRACE ("ACE_Bounded_Set<T>::is_full");
return this->cur_size_ == this->max_size_;
}
// --
template <class T> ACE_INLINE int
ACE_Ordered_MultiSet_Iterator<T>::first (void)
{
ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::first");
current_ = set_.head_;
return (current_ ? 1 : 0);
}
template <class T> ACE_INLINE int
ACE_Ordered_MultiSet_Iterator<T>::last (void)
{
ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::last");
current_ = set_.tail_;
return (current_ ? 1 : 0);
}
template <class T> ACE_INLINE int
ACE_Ordered_MultiSet_Iterator<T>::advance (void)
{
ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::advance");
current_ = current_ ? current_->next_ : 0;
return (current_ ? 1 : 0);
}
template <class T> ACE_INLINE int
ACE_Ordered_MultiSet_Iterator<T>::retreat (void)
{
ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::retreat");
current_ = current_ ? current_->prev_ : 0;
return (current_ ? 1 : 0);
}
template <class T> ACE_INLINE int
ACE_Ordered_MultiSet_Iterator<T>::done (void) const
{
ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::done");
return (current_ ? 0 : 1);
}
template <class T> ACE_INLINE void
ACE_Ordered_MultiSet_Iterator<T>::dump (void) const
{
@@ -248,33 +209,26 @@ ACE_Ordered_MultiSet_Iterator<T>::dump (void) const
#endif /* ACE_HAS_DUMP */
}
// --
template <class T> ACE_INLINE int
ACE_Ordered_MultiSet<T>::is_empty (void) const
{
ACE_TRACE ("ACE_Ordered_MultiSet<T>::is_empty");
return this->cur_size_ > 0 ? 0 : 1;
}
template <class T> ACE_INLINE size_t
ACE_Ordered_MultiSet<T>::size (void) const
{
// ACE_TRACE ("ACE_Ordered_MultiSet<T>::size");
return this->cur_size_;
}
// ****************************************************************
template <class T> ACE_INLINE
ACE_Array<T>::ACE_Array (size_t size,
ACE_Allocator *alloc)
: ACE_Array_Base<T> (size, alloc)
{
}
template <class T> ACE_INLINE
ACE_Array<T>::ACE_Array (size_t size,
const T &default_value,
@@ -282,45 +236,34 @@ ACE_Array<T>::ACE_Array (size_t size,
: ACE_Array_Base<T> (size, default_value, alloc)
{
}
// The copy constructor (performs initialization).
template <class T> ACE_INLINE
ACE_Array<T>::ACE_Array (const ACE_Array<T> &s)
: ACE_Array_Base<T> (s)
{
}
// Assignment operator (performs assignment).
template <class T> ACE_INLINE void
ACE_Array<T>::operator= (const ACE_Array<T> &s)
{
// Check for "self-assignment".
if (this != &s)
this->ACE_Array_Base<T>::operator= (s);
}
// Compare this array with <s> for inequality.
template <class T> ACE_INLINE bool
ACE_Array<T>::operator!= (const ACE_Array<T> &s) const
{
return !(*this == s);
}
// ****************************************************************
// ****************************************************************
template <class T> ACE_INLINE void
ACE_DLList<T>::operator= (const ACE_DLList<T> &l)
{
*(ACE_DLList_Base *) this = l;
}
template <class T> ACE_INLINE int
ACE_DLList<T>::get (T *&item, size_t index)
{
@@ -330,7 +273,6 @@ ACE_DLList<T>::get (T *&item, size_t index)
item = (T *) node->item_;
return result;
}
template <class T> ACE_INLINE void
ACE_DLList<T>::dump (void) const
{
@@ -338,7 +280,6 @@ ACE_DLList<T>::dump (void) const
ACE_DLList_Base::dump ();
#endif /* ACE_HAS_DUMP */
}
template <class T> ACE_INLINE int
ACE_DLList<T>::remove (ACE_DLList_Node *n)
{
@@ -348,25 +289,21 @@ ACE_DLList<T>::remove (ACE_DLList_Node *n)
ACE_DLList_Node);
return result;
}
template <class T> ACE_INLINE
ACE_DLList<T>::ACE_DLList (ACE_Allocator *alloc)
: ACE_DLList_Base (alloc)
{
}
template <class T> ACE_INLINE
ACE_DLList<T>::ACE_DLList (const ACE_DLList<T> &l)
: ACE_DLList_Base ((ACE_DLList<T> &) l)
{
}
template <class T> ACE_INLINE
ACE_DLList<T>::~ACE_DLList (void)
{
while (this->delete_head ()) ;
}
template <class T> ACE_INLINE int
ACE_DLList_Iterator<T>::remove (void)
{
@@ -374,21 +311,18 @@ ACE_DLList_Iterator<T>::remove (void)
this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance ();
return list_->remove (temp);
}
template <class T> ACE_INLINE
ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l)
: ACE_Double_Linked_List_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
list_ (&l)
{
}
template <class T> ACE_INLINE void
ACE_DLList_Iterator<T>::reset (ACE_DLList<T> &l)
{
list_ = &l;
this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l);
}
template <class T> ACE_INLINE int
ACE_DLList_Iterator<T>::next (T *&ptr)
{
@@ -398,20 +332,17 @@ ACE_DLList_Iterator<T>::next (T *&ptr)
ptr = (T *) temp->item_;
return temp ? 1 : 0;
}
template <class T> ACE_INLINE T *
ACE_DLList_Iterator<T>::next (void) const
{
ACE_DLList_Node *temp = ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next ();
return (T *) (temp ? temp->item_ : 0);
}
template <class T> ACE_INLINE int
ACE_DLList_Iterator<T>::advance (void)
{
return this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance ();
}
template <class T> ACE_INLINE void
ACE_DLList_Iterator<T>::dump (void) const
{
@@ -420,7 +351,6 @@ ACE_DLList_Iterator<T>::dump (void) const
#endif /* ACE_HAS_DUMP */
}
template <class T> ACE_INLINE int
ACE_DLList_Reverse_Iterator<T>::remove (void)
{
@@ -428,27 +358,23 @@ ACE_DLList_Reverse_Iterator<T>::remove (void)
this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance ();
return list_->remove (temp);
}
template <class T> ACE_INLINE
ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l)
: ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
list_ (&l)
{
}
template <class T> ACE_INLINE void
ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l)
{
list_ = &l;
this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l);
}
template <class T> ACE_INLINE int
ACE_DLList_Reverse_Iterator<T>::advance (void)
{
return ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance ();
}
template <class T> ACE_INLINE int
ACE_DLList_Reverse_Iterator<T>::next (T *&ptr)
{
@@ -459,7 +385,6 @@ ACE_DLList_Reverse_Iterator<T>::next (T *&ptr)
ptr = (T *) temp->item_;
return 1;
}
template <class T> ACE_INLINE T *
ACE_DLList_Reverse_Iterator<T>::next (void) const
{
@@ -467,7 +392,6 @@ ACE_DLList_Reverse_Iterator<T>::next (void) const
return (T *) (temp ? temp->item_ : 0);
}
template <class T> ACE_INLINE void
ACE_DLList_Reverse_Iterator<T>::dump (void) const
{
@@ -475,5 +399,4 @@ ACE_DLList_Reverse_Iterator<T>::dump (void) const
ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::dump ();
#endif /* ACE_HAS_DUMP */
}
ACE_END_VERSIONED_NAMESPACE_DECL