Commit 41d1138f by Rainer Orth Committed by Rainer Orth

task-1.C: Renamed err to e.

	* testsuite/libgomp.c++/task-1.C: Renamed err to e.
	* testsuite/libgomp.c++/task-6.C: Likewise.

From-SVN: r156354
parent bac4175b
2010-01-29 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* testsuite/libgomp.c++/task-1.C: Renamed err to e.
* testsuite/libgomp.c++/task-6.C: Likewise.
2010-01-28 Steve Ellcey <sje@cup.hp.com> 2010-01-28 Steve Ellcey <sje@cup.hp.com>
* configure.tgt (*-*-hpux*): Add -frandom-seed flag. * configure.tgt (*-*-hpux*): Add -frandom-seed flag.
......
...@@ -20,7 +20,7 @@ f1 (int i, int j, int k) ...@@ -20,7 +20,7 @@ f1 (int i, int j, int k)
} }
int v1 = 1, v2 = 2, v5 = 5; int v1 = 1, v2 = 2, v5 = 5;
int err; int e;
void void
f2 (void) f2 (void)
...@@ -35,12 +35,12 @@ f2 (void) ...@@ -35,12 +35,12 @@ f2 (void)
#pragma omp task #pragma omp task
{ {
if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6)
err = 1; e = 1;
} }
#pragma omp taskwait #pragma omp taskwait
if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6)
abort (); abort ();
if (err) if (e)
abort (); abort ();
} }
} }
......
...@@ -21,7 +21,7 @@ f1 (T i, T j, T k) ...@@ -21,7 +21,7 @@ f1 (T i, T j, T k)
} }
int v1 = 1, v2 = 2, v5 = 5; int v1 = 1, v2 = 2, v5 = 5;
int err; int e;
template <typename T> template <typename T>
void void
...@@ -37,12 +37,12 @@ f2 (void) ...@@ -37,12 +37,12 @@ f2 (void)
#pragma omp task #pragma omp task
{ {
if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6)
err = 1; e = 1;
} }
#pragma omp taskwait #pragma omp taskwait
if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6)
abort (); abort ();
if (err) if (e)
abort (); abort ();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment