diff options
| author | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-10-28 19:15:14 +0000 |
|---|---|---|
| committer | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-10-28 19:15:14 +0000 |
| commit | 9738b1ad41774bd4d5086322d48793238c8694a7 (patch) | |
| tree | 7aaaac48d29dabf36c646d4830cdba22e97a7e13 /ace/Containers_T.cpp | |
| parent | af4cd25a55a9c357b2c04823663bc93e70c0b657 (diff) | |
| download | ATCD-9738b1ad41774bd4d5086322d48793238c8694a7.tar.gz | |
ChangeLogTag: Sun Oct 28 13:15:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>
Diffstat (limited to 'ace/Containers_T.cpp')
| -rw-r--r-- | ace/Containers_T.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index d87c3ad04d5..7f6d0683368 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -243,7 +243,8 @@ ACE_Unbounded_Stack<T>::push (const T &new_item) ACE_Node<T> *temp; ACE_NEW_MALLOC_RETURN (temp, - (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)), + ACE_static_cast(ACE_Node<T> *, + this->allocator_->malloc (sizeof (ACE_Node<T>))), ACE_Node<T> (new_item, this->head_->next_), -1); this->head_->next_ = temp; @@ -838,8 +839,10 @@ ACE_Double_Linked_List<T>::copy_nodes (const ACE_Double_Linked_List<T> &c) !iter.done (); iter.advance ()) { - T* temp = (T *) this->allocator_->malloc (sizeof (T)); - new (temp) T (*iter.next ()); + T* temp = 0; + ACE_NEW_MALLOC (temp, + (T *)this->allocator_->malloc (sizeof (T)), + T (*iter.next ())); this->insert_tail (temp); } } @@ -1554,7 +1557,8 @@ ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position, // create a new node ACE_DNode<T> *temp; ACE_NEW_MALLOC_RETURN (temp, - (ACE_DNode<T>*) this->allocator_->malloc (sizeof (ACE_DNode<T>)), + ACE_static_cast(ACE_DNode<T>*, + this->allocator_->malloc (sizeof (ACE_DNode<T>))), ACE_DNode<T> (item), -1); // obtain approximate location of the node @@ -1741,7 +1745,8 @@ ACE_DLList<T>::insert_tail (T *new_item) { ACE_DLList_Node *temp1, *temp2; ACE_NEW_MALLOC_RETURN (temp1, - (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)), + ACE_static_cast(ACE_DLList_Node *, + this->allocator_->malloc (sizeof (ACE_DLList_Node))), ACE_DLList_Node ((void *&)new_item), 0); temp2 = ACE_DLList_Base::insert_tail (temp1); @@ -1752,8 +1757,7 @@ template <class T> T * ACE_DLList<T>::insert_head (T *new_item) { ACE_DLList_Node *temp1; - ACE_NEW_MALLOC_RETURN ( - temp1, + ACE_NEW_MALLOC_RETURN (temp1, (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)), ACE_DLList_Node ((void *&)new_item), 0); ACE_DLList_Node *temp2 = |