diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-29 15:34:07 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-29 15:34:07 +0000 |
| commit | 142039591ec70a619c1d9321089aa6a3d3cc7c44 (patch) | |
| tree | d1a2f3447db78dafaa30242f311fa41acc7fcc7f /libgomp | |
| parent | 453b283076414c342de175ef9b64aa71ff6708af (diff) | |
| download | gcc-142039591ec70a619c1d9321089aa6a3d3cc7c44.tar.gz | |
* testsuite/libgomp.c++/task-1.C: Renamed err to e.
* testsuite/libgomp.c++/task-6.C: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156354 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -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 246d411384b..dcd532f06b6 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 535a8287b0c..94ab6f21f18 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 cc9072b9d1c..389e1e218e4 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 (); } } |