diff options
| author | Steve Huston <shuston@riverace.com> | 2002-07-02 19:59:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-07-02 19:59:51 +0000 |
| commit | c9e1dc4b750f0bf2266b75612e5ab0e8705ca73e (patch) | |
| tree | a77769a96ea72729688e1c40978f8f4a5512e0be /ace/Thread_Adapter.cpp | |
| parent | 2cdbdc336fbc361672efc4e9f26f68f9a04f24dc (diff) | |
| download | ATCD-c9e1dc4b750f0bf2266b75612e5ab0e8705ca73e.tar.gz | |
ChangeLogTag:Tue Jul 2 11:53:29 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace/Thread_Adapter.cpp')
| -rw-r--r-- | ace/Thread_Adapter.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp index dd80e1a9699..7647112fe6c 100644 --- a/ace/Thread_Adapter.cpp +++ b/ace/Thread_Adapter.cpp @@ -43,7 +43,7 @@ ACE_Thread_Adapter::~ACE_Thread_Adapter (void) { } -void * +ACE_THR_FUNC_RETURN ACE_Thread_Adapter::invoke (void) { // Inherit the logging features if the parent thread has an @@ -93,7 +93,7 @@ ACE_Thread_Adapter::invoke (void) return this->invoke_i (); } -void * +ACE_THR_FUNC_RETURN ACE_Thread_Adapter::invoke_i (void) { // Extract the arguments. @@ -126,7 +126,7 @@ ACE_Thread_Adapter::invoke_i (void) #endif /* ACE_NEEDS_LWP_PRIO_SET */ - void *status = 0; + ACE_THR_FUNC_RETURN status = 0; ACE_SEH_TRY { @@ -139,21 +139,17 @@ ACE_Thread_Adapter::invoke_i (void) // Invoke the start hook to give the user a chance to // perform some initialization processing before the // <func> is invoked. - status = hook->start (ACE_reinterpret_cast (ACE_THR_FUNC, func), - arg); + status = hook->start (func, arg); else { // Call thread entry point. #if defined (ACE_PSOS) + status = 0; (*func) (arg); #else /* ! ACE_PSOS */ - status = ACE_reinterpret_cast (void *, (*func) (arg)); + status = (*func) (arg); #endif /* ACE_PSOS */ } -#if defined (ACE_PSOS) - // pSOS task functions do not return a value. - status = 0; -#endif /* ACE_PSOS */ } #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) |