diff options
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/task-1.C | 6 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/task-6.C | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 246d411..dcd532f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +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> * configure.tgt (*-*-hpux*): Add -frandom-seed flag. diff --git a/libgomp/testsuite/libgomp.c++/task-1.C b/libgomp/testsuite/libgomp.c++/task-1.C index 535a828..94ab6f2 100644 --- a/libgomp/testsuite/libgomp.c++/task-1.C +++ b/libgomp/testsuite/libgomp.c++/task-1.C @@ -20,7 +20,7 @@ f1 (int i, int j, int k) } int v1 = 1, v2 = 2, v5 = 5; -int err; +int e; void f2 (void) @@ -35,12 +35,12 @@ f2 (void) #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) - err = 1; + e = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); - if (err) + if (e) abort (); } } diff --git a/libgomp/testsuite/libgomp.c++/task-6.C b/libgomp/testsuite/libgomp.c++/task-6.C index cc9072b..389e1e2 100644 --- a/libgomp/testsuite/libgomp.c++/task-6.C +++ b/libgomp/testsuite/libgomp.c++/task-6.C @@ -21,7 +21,7 @@ f1 (T i, T j, T k) } int v1 = 1, v2 = 2, v5 = 5; -int err; +int e; template <typename T> void @@ -37,12 +37,12 @@ f2 (void) #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) - err = 1; + e = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); - if (err) + if (e) abort (); } } |