summaryrefslogtreecommitdiff
path: root/ace/Sched_Params.cpp
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1998-08-17 18:08:56 +0000
committerSteve Huston <shuston@riverace.com>1998-08-17 18:08:56 +0000
commitf9be9fc2a65f15f80eaef18e13433252904e14ba (patch)
tree16a0799440e16dc5f1a5cc39ca5164a04ef1c3f3 /ace/Sched_Params.cpp
parentd098dc24f9165c6e1099289ff5b38bd202662ffe (diff)
downloadATCD-f9be9fc2a65f15f80eaef18e13433252904e14ba.tar.gz
Changed to not use ACE_HAS_DCETHREADS (or DCE_DRAFT4_THREADS) - unify around the
new symbols: ACE_HAS_PTHREADS, which must be combined with one of: ACE_HAS_PTHREADS_DRAFT4, ACE_HAS_PTHREADS_DRAFT6, ACE_HAS_PTHREADS_DRAFT7, or ACE_HAS_PTHREADS_STD.
Diffstat (limited to 'ace/Sched_Params.cpp')
-rw-r--r--ace/Sched_Params.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index 7b02020752c..0567c58a938 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -68,7 +68,7 @@ ACE_Sched_Params::priority_min (const Policy policy,
}
else
return 0;
-#elif defined (ACE_HAS_DCETHREADS) || defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED)
+#elif defined (ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED)
switch (scope)
{
@@ -148,7 +148,7 @@ ACE_Sched_Params::priority_max (const Policy policy,
return policy == ACE_SCHED_OTHER
? ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri
: ((rtinfo_t *) pcinfo.pc_clinfo)->rt_maxpri;
-#elif defined (ACE_HAS_DCETHREADS) || defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED)
+#elif defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED)
switch (scope)
{
@@ -228,8 +228,8 @@ ACE_Sched_Params::next_priority (const Policy policy,
default:
return priority; // unknown priority: should never get here
}
-#elif defined (ACE_HAS_THREADS) && (defined (ACE_HAS_DCETHREADS) || !defined(ACE_LACKS_SETSCHED))
- // including STHREADS, DCETHREADS, and PTHREADS
+#elif defined(ACE_HAS_THREADS) && !defined(ACE_LACKS_SETSCHED)
+ // including STHREADS, and PTHREADS
const int max = priority_max (policy, scope);
return priority < max ? priority + 1 : max;
#else
@@ -271,8 +271,8 @@ ACE_Sched_Params::previous_priority (const Policy policy,
default:
return priority; // unknown priority: should never get here
}
-#elif defined (ACE_HAS_THREADS) && (defined (ACE_HAS_DCETHREADS) || !defined(ACE_LACKS_SETSCHED))
- // including STHREADS, DCETHREADS, and PTHREADS
+#elif defined (ACE_HAS_THREADS) && !defined(ACE_LACKS_SETSCHED)
+ // including STHREADS and PTHREADS
const int min = priority_min (policy, scope);
return priority > min ? priority - 1 : min;