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

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

Author: tgg-guest
Date: Fri Jun  9 11:50:51 2006
New Revision: 361

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=361
Log:
`Log_Msg.cpp' type-punned warning removal attempt.

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=361&op=diff
==============================================================================
--- trunk/debian/patches/31-gcc-4.1-fix.dpatch (original)
+++ trunk/debian/patches/31-gcc-4.1-fix.dpatch Fri Jun  9 11:50:51 2006
@@ -636,3 +636,38 @@
  #endif /* ACE_HAS_THR_C_DEST */
  
    return guard->tryacquire_read ();
+--- ACE_wrappers/ace/Log_Msg.cpp-	2006-06-09 11:24:38.000000000 +0000
++++ ACE_wrappers/ace/Log_Msg.cpp	2006-06-09 11:41:13.000000000 +0000
+@@ -258,12 +258,12 @@
+ # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
+      defined (ACE_HAS_TSS_EMULATION)
+   ACE_Log_Msg *tss_log_msg = 0;
++  void *temp = tss_log_msg; // Need this temp to keep G++ from complaining.
+ 
+   // Get the tss_log_msg from thread-specific storage.
+   return key_created_
+-    && ACE_Thread::getspecific (*(log_msg_tss_key ()),
+-                                reinterpret_cast<void **> (&tss_log_msg)) != -1
+-    && tss_log_msg;
++    && ACE_Thread::getspecific (*(log_msg_tss_key ()), &temp) != -1
++    && (tss_log_msg = static_cast <ACE_Log_Msg *> (temp)) != 0;
+ # else
+ #   error "Platform must support thread-specific storage if threads are used."
+ # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
+@@ -329,12 +329,14 @@
+     }
+ 
+   ACE_Log_Msg *tss_log_msg = 0;
++  void *temp = tss_log_msg;
+ 
+   // Get the tss_log_msg from thread-specific storage.
+-  if (ACE_Thread::getspecific (*(log_msg_tss_key ()),
+-                               reinterpret_cast<void **> (&tss_log_msg)) == -1)
++  if (ACE_Thread::getspecific (*(log_msg_tss_key ()), &temp) == -1)
+     return 0; // This should not happen!
+ 
++  tss_log_msg = static_cast <ACE_Log_Msg *> (temp);
++
+   // Check to see if this is the first time in for this thread.
+   if (tss_log_msg == 0)
+     {