From 4e9445bc401e8ef4399e9fc1180713a35f0145c2 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 29 Jun 2011 10:38:46 +0000
Subject:

---
 ACE/ChangeLog              | 5 +++++
 ACE/ace/Thread_Manager.cpp | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 1ab2606666b..c4ba2325ad0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 29 10:38:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Thread_Manager.cpp:
+          Fixed compile error in some environments
+
 Wed Jun 29 07:56:54 UTC 2011  Martin Corino  <mcorino@remedy.nl>
 
         * ace/config-lynxos.h:
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index 0dfef7adb26..82680a00e69 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -525,10 +525,11 @@ ace_thread_manager_adapter (void *args)
   exit_hook.thr_mgr (thread_args->thr_mgr ());
 
   // Invoke the user-supplied function with the args.
-  void *status = thread_args->invoke ();
+  ACE_THR_FUNC_RETURN status = thread_args->invoke ();
 
   delete static_cast<ACE_Base_Thread_Adapter *> (thread_args);
-  return status;
+
+  return reinterpret_cast<void *> (status);
 }
 #endif
 
-- 
cgit v1.2.1