summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-10-31 01:46:41 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-10-31 01:46:41 +0000
commit6a5840d5a9bee7ec9c39b1fe4e42d5b14a48de82 (patch)
tree5bda292771396df1a92fc31cd2ab5a401353e312
parent8e17ac1ab71f22d14a19164daa17414db038fc79 (diff)
downloadATCD-6a5840d5a9bee7ec9c39b1fe4e42d5b14a48de82.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-97b4
-rw-r--r--tests/Priority_Task_Test.cpp16
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b
index 9b8f939d100..a1b32bdcd11 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,5 +1,9 @@
Thu Oct 30 17:49:56 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
+ * tests/Priority_Task_Test.cpp (main): Moved "int status" out of
+ the #if defined (ACE_HAS_THREADS) so that it will compile when
+ the platform *doesn't* have threads.
+
* ace/Synch_T.i (ACE_TSS): Added a missing ':' that was causing
problems on platforms that lack threads. Thanks to Laura
Paterno <lpaterno@d0chb.fnal.gov> for helping to track this
diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp
index 31be9d7e750..c4e3cba8ef1 100644
--- a/tests/Priority_Task_Test.cpp
+++ b/tests/Priority_Task_Test.cpp
@@ -102,10 +102,8 @@ Priority_Task::svc (void)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "getprio failed"), -1);
if (prio == this->priority_)
- {
- ACE_DEBUG ((LM_DEBUG, "(%t) actual prio of %d equals desired priority\n",
+ ACE_DEBUG ((LM_DEBUG, "(%t) actual prio of %d equals desired priority\n",
prio));
- }
else
{
ACE_DEBUG ((LM_ERROR, "(%t) actual prio = %d, desired priority_ = %d!\n",
@@ -123,19 +121,21 @@ main (int, char *[])
{
ACE_START_TEST ("Priority_Task_Test");
+ int status = 0;
+
#if defined (ACE_HAS_THREADS)
Priority_Task tasks[ACE_MAX_ITERATIONS];
- int status = 0;
int i;
// Spawn off ACE_MAX_ITERATIONS of tasks, passing each one their
// iteration number as their priority.
- // NOTE: on Solaris, for example, this requests the min FIFO
+ // NOTE: on Solaris, for example, this requests the min FIFO
// priority. But, this test doesn't use the Realtime scheduling
- // class. The FIFO priorities are used because they're all nonnegative.
+ // class. The FIFO priorities are used because they're all
+ // nonnegative.
ACE_Sched_Priority_Iterator priority (ACE_SCHED_FIFO,
ACE_SCOPE_THREAD);
@@ -147,9 +147,7 @@ main (int, char *[])
// If there are more priorities get the next one...
if (priority.more ())
- {
- priority.next ();
- }
+ priority.next ();
}
ACE_DEBUG ((LM_DEBUG, "(%t) %d tasks spawned, wait for them to exit . . .\n",