diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 13:21:58 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 13:21:58 +0000 |
commit | 2baec388a3993d95d0416f74469a61fe9748a1a5 (patch) | |
tree | dc8f7bdfd415408f9b512adec40a8064b7f7781b | |
parent | 5cb40f1f4df412262c662caf696e83da94e8f911 (diff) | |
download | ATCD-2baec388a3993d95d0416f74469a61fe9748a1a5.tar.gz |
-rw-r--r-- | ACE/ace/Task.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp index a58ba93e2dc..a664ca0bf07 100644 --- a/ACE/ace/Task.cpp +++ b/ACE/ace/Task.cpp @@ -274,7 +274,7 @@ 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__ < 0x600)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1500)) || (defined (ACE_WIN32) && defined (__DCC__)) +#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1500)) || (defined (ACE_WIN32) && defined (__DCC__)) || (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x660)) // Some compilers complain about reinterpret_cast from int to unsigned long... status = static_cast<ACE_THR_FUNC_RETURN> (svc_status); #else |