Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).

1 files changed, 10 insertions, 3 deletions

diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp
index 0c8c50db1d8..17acc652f27 100644
--- a/ACE/ace/Task.cpp
+++ b/ACE/ace/Task.cpp
@@ -5,6 +5,7 @@
 #include "ace/Task.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/OS_NS_string.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -13,8 +14,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
     thr_mgr_ (thr_man),
     flags_ (0),
     grp_id_ (-1)
+#if !(defined (ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT))
     ,last_thread_id_ (0)
+#endif /* ! ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
 {
+#if defined (ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT)
+   ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ ));
+#endif /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
 }
 
 ACE_Task_Base::~ACE_Task_Base (void)
@@ -186,11 +192,11 @@ ACE_Task_Base::activate (long flags,
   if (this->grp_id_ == -1)
     this->grp_id_ = grp_spawned;
 
-#if defined(ACE_TANDEM_T1248_PTHREADS)
+#if defined(ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT)
   ACE_OS::memcpy( &this->last_thread_id_, '\0', sizeof(this->last_thread_id_));
 #else
   this->last_thread_id_ = 0;    // Reset to prevent inadvertant match on ID
-#endif /* defined (ACE_TANDEM_T1248_PTHREADS) */
+#endif /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
 
   return 0;
 
@@ -258,9 +264,10 @@ ACE_Task_Base::svc_run (void *args)
   t->thr_mgr ()->at_exit (t, ACE_Task_Base::cleanup, 0);
 #endif /* ACE_HAS_SIG_C_FUNC */
 
+  ACE_THR_FUNC_RETURN status;
   // Call the Task's svc() hook method.
   int const svc_status = t->svc ();
-  ACE_THR_FUNC_RETURN status;
+
 #if defined (ACE_HAS_INTEGRAL_TYPE_THR_FUNC_RETURN)
   // Reinterpret case between integral types is not mentioned in the C++ spec
   status = static_cast<ACE_THR_FUNC_RETURN> (svc_status);