[Pkg-ace-devel] r362 - /trunk/debian/patches/31-gcc-4.1-fix.dpatch

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Fri Jun  9 12:18:08 2006
New Revision: 362

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=362
Log:
Add a patch for Containers_T.cpp.  This one should be submitted upstream.

Modified:
    trunk/debian/patches/31-gcc-4.1-fix.dpatch

Modified: trunk/debian/patches/31-gcc-4.1-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/31-gcc-4.1-fix.dpatch?rev=362&op=diff
==============================================================================
--- trunk/debian/patches/31-gcc-4.1-fix.dpatch (original)
+++ trunk/debian/patches/31-gcc-4.1-fix.dpatch Fri Jun  9 12:18:08 2006
@@ -671,3 +671,29 @@
    // Check to see if this is the first time in for this thread.
    if (tss_log_msg == 0)
      {
+--- ACE_wrappers/ace/Containers_T.cpp-	2006-06-09 11:57:28.000000000 +0000
++++ ACE_wrappers/ace/Containers_T.cpp	2006-06-09 12:16:38.000000000 +0000
+@@ -1869,9 +1869,10 @@
+ ACE_DLList<T>::insert_tail (T *new_item)
+ {
+   ACE_DLList_Node *temp1, *temp2;
++  void *temp = new_item;
+   ACE_NEW_MALLOC_RETURN (temp1,
+                          static_cast<ACE_DLList_Node *> (this->allocator_->malloc (sizeof (ACE_DLList_Node))),
+-                         ACE_DLList_Node ((void *&)new_item),
++                         ACE_DLList_Node (temp),
+                          0);
+   temp2 = ACE_DLList_Base::insert_tail (temp1);
+   return (T *) (temp2 ? temp2->item_ : 0);
+@@ -1881,9 +1882,10 @@
+ ACE_DLList<T>::insert_head (T *new_item)
+ {
+   ACE_DLList_Node *temp1;
++  void *temp = new_item;
+   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 (temp), 0);
+   ACE_DLList_Node *temp2 =
+     ACE_DLList_Base::insert_head (temp1);
+   return (T *) (temp2 ? temp2->item_ : 0);