diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 21:19:02 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 21:19:02 +0000 |
| commit | 40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch) | |
| tree | 37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7 /ace/Task.cpp | |
| parent | c254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff) | |
| download | ATCD-40fdc8a404e75ab03b68cc62e9987cf208fd8c30.tar.gz | |
This commit was manufactured by cvs2svn to create branchtypecode-overhaul
'typecode-overhaul'.
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 a7fa0894b26..a5a51d0da93 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__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined (ACE_WIN32) && defined(__IBMCPP__)) +#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) // Some compilers complain about reinterpret_cast from int to unsigned long... status = static_cast<ACE_THR_FUNC_RETURN> (svc_status); #else status = reinterpret_cast<ACE_THR_FUNC_RETURN> (svc_status); -#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 || __IBMCPP__ */ +#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 */ // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke #if 1 |