diff options
| author | Steve Huston <shuston@riverace.com> | 2002-07-08 21:29:12 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-07-08 21:29:12 +0000 |
| commit | 641c6ac0cc57e33d9c75523ca17c02bcd2d291ef (patch) | |
| tree | 46075f655df7a106b9fa52246b7448b9fd3fb1a7 | |
| parent | 8dd47401f5615f9456f1644a424c140d862edb31 (diff) | |
| download | ATCD-641c6ac0cc57e33d9c75523ca17c02bcd2d291ef.tar.gz | |
ChangeLogTag:Mon Jul 8 17:26:51 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 13 | ||||
| -rw-r--r-- | ace/Task.cpp | 10 |
3 files changed, 28 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 5ce0c4538bd..fb375ca3b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ +Mon Jul 8 17:26:51 2002 Steve Huston <shuston@riverace.com> + + * ace/Task.cpp (svc_run): Borland complains about reinterpret_cast from + int to unsigned long, so change the cast to ACE_THR_FUNC_RETURN to + a static_cast for that compiler. Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for this fix. + Fri Jul 5 10:30:44 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/Array_Base.cpp: Swapped the order of includes so that - Array_Base.h comes after Malloc_Base.h. Thanks to Al Pariante - <Albert.Pariante@axcelis.com> for reporting this. + * ace/Array_Base.cpp: Swapped the order of includes so that + Array_Base.h comes after Malloc_Base.h. Thanks to Al Pariante + <Albert.Pariante@axcelis.com> for reporting this. Thu Jul 4 11:27:05 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 5ce0c4538bd..fb375ca3b92 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,8 +1,15 @@ +Mon Jul 8 17:26:51 2002 Steve Huston <shuston@riverace.com> + + * ace/Task.cpp (svc_run): Borland complains about reinterpret_cast from + int to unsigned long, so change the cast to ACE_THR_FUNC_RETURN to + a static_cast for that compiler. Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for this fix. + Fri Jul 5 10:30:44 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/Array_Base.cpp: Swapped the order of includes so that - Array_Base.h comes after Malloc_Base.h. Thanks to Al Pariante - <Albert.Pariante@axcelis.com> for reporting this. + * ace/Array_Base.cpp: Swapped the order of includes so that + Array_Base.h comes after Malloc_Base.h. Thanks to Al Pariante + <Albert.Pariante@axcelis.com> for reporting this. Thu Jul 4 11:27:05 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> diff --git a/ace/Task.cpp b/ace/Task.cpp index a841b0295dd..bf9034bf8cf 100644 --- a/ace/Task.cpp +++ b/ace/Task.cpp @@ -200,8 +200,14 @@ ACE_Task_Base::svc_run (void *args) #endif /* ACE_HAS_SIG_C_FUNC */ // Call the Task's svc() hook method. - ACE_THR_FUNC_RETURN status = - ACE_reinterpret_cast(ACE_THR_FUNC_RETURN, t->svc ()); + int svc_status = t->svc (); + ACE_THR_FUNC_RETURN status; +#if defined (__BORLANDC__) + // C++Builder complains about reinterpret_cast from int to unsigned long... + status = ACE_static_cast (ACE_THR_FUNC_RETURN, svc_status); +#else + status = ACE_reinterpret_cast(ACE_THR_FUNC_RETURN, svc_status); +#endif /* __BORLANDC__ */ // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke #if 1 |