diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-09-01 08:16:44 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-09-01 08:16:44 +0000 |
commit | 58eff58f4db0b12240b8c0265f640d923482243f (patch) | |
tree | 6f0201cefdee4abcb4e59c61b1646fc4aa3b82a3 /ace/Task.cpp | |
parent | 869a107bf4d924c5552196ee5de4d1fbccba8b69 (diff) | |
download | ATCD-58eff58f4db0b12240b8c0265f640d923482243f.tar.gz |
ChangeLogTag: Sun Sep 01 2002 08:18:12 UTC Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/Task.cpp')
-rw-r--r-- | ace/Task.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/Task.cpp b/ace/Task.cpp index acefff92349..960977d84ae 100644 --- a/ace/Task.cpp +++ b/ace/Task.cpp @@ -202,12 +202,12 @@ ACE_Task_Base::svc_run (void *args) // Call the Task's svc() hook method. int svc_status = t->svc (); ACE_THR_FUNC_RETURN status; -#if defined (__BORLANDC__) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1200)) +#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1200)) // Some compilers complain 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__ || __MINGW32__ || _MSC_VER <= 1200 */ +#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1200 */ // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke #if 1 |