diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-12 12:34:55 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-12 12:34:55 +0000 |
| commit | b8588db0752e9ede07e0e94e6d63fbd05e21e291 (patch) | |
| tree | d3ec6a12b299badd942a3fec8e73f09abf8728a5 | |
| parent | 2bd312c9af739a530a71b32c5745acb210697734 (diff) | |
| download | ATCD-b8588db0752e9ede07e0e94e6d63fbd05e21e291.tar.gz | |
ChangeLogTag: Fri Nov 12 06:33:02 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/OS_NS_Thread.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 5f950333fc7..73b350a253b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 12 06:33:02 2004 Chad Elliott <elliott_c@ociweb.com> + + * ace/OS_NS_Thread.cpp: + + Removed a duplicated #elif clause. + Fri Nov 11 12:29:12 UTC 2004 Martin Corino <mcorino@remedy.nl> * include/makeinclude/platform_vxworks5.5.x.GNU: diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp index 845528529a7..1ee6608d411 100644 --- a/ace/OS_NS_Thread.cpp +++ b/ace/OS_NS_Thread.cpp @@ -1957,10 +1957,8 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, int, -1); #elif defined (ACE_HAS_STHREADS) return ACE_OS::set_scheduling_params (sched_params, id); -#elif defined (ACE_HAS_PTHREADS) \ - && ( !defined (ACE_LACKS_SETSCHED) \ - || defined( ACE_TANDEM_T1248_PTHREADS) ) -#elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_SETSCHED) +#elif defined (ACE_HAS_PTHREADS) && \ + (!defined (ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS)) ACE_UNUSED_ARG (id); if (sched_params.quantum () != ACE_Time_Value::zero) { |