diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-06-06 10:34:41 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-06-06 10:34:41 +0000 |
| commit | f44e78ebb6a9bc31c5b163637a3ec2727afdde1b (patch) | |
| tree | 738db3cbe5103346d3d06df9730f40e0ad088541 | |
| parent | 09f9d6a434a842eea4962138fa98b1f7f0254360 (diff) | |
Minor formatting fixes before the merge.gomp-3_0-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gomp-3_0-branch@136430 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/openmp.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gomp/for-16.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 | 2 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 2 | ||||
| -rw-r--r-- | libgomp/config/linux/lock.c | 2 | ||||
| -rw-r--r-- | libgomp/libgomp.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 569360f79b3..28f1cc24dfd 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -397,14 +397,14 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) if (p) { gfc_error (p); - collapse = 1; + collapse = 1; } else if (collapse <= 0) { gfc_error ("COLLAPSE clause argument not constant positive integer at %C"); collapse = 1; } - c->collapse = collapse; + c->collapse = collapse; gfc_free_expr (cexpr); continue; } diff --git a/gcc/testsuite/g++.dg/gomp/for-16.C b/gcc/testsuite/g++.dg/gomp/for-16.C index 2b4b23c96a7..dbbed8fe505 100644 --- a/gcc/testsuite/g++.dg/gomp/for-16.C +++ b/gcc/testsuite/g++.dg/gomp/for-16.C @@ -12,7 +12,7 @@ void foo () #pragma omp for for (int l = 0; l < 10; ); // { dg-error "missing increment expression" } #pragma omp for - for (int m = 0; m < 10; m *= 3); // { dg-error "invalid increment expression" } + for (int m = 0; m < 10; m *= 3); // { dg-error "invalid increment expression" } #pragma omp for for (T n = 0; ; n++); // { dg-error "missing controlling predicate" } #pragma omp for diff --git a/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 b/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 index aa6f2c5204f..5c1581454b2 100644 --- a/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 @@ -5,7 +5,7 @@ subroutine foo (vara, varb, varc, vard, n) integer :: n, vara(n), varb(*), varc(:), vard(6), vare(6) vare(:) = 0 !$omp parallel default(none) shared(vara, varb, varc, vard, vare) - !$omp master + !$omp master vara(1) = 1 varb(1) = 1 varc(1) = 1 diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index cda0489acc3..3034ba339e1 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1963,7 +1963,7 @@ remove_useless_stmts_1 (tree *tp, struct rus_data *data) data->last_goto = NULL; } break; - + default: data->last_goto = NULL; break; diff --git a/libgomp/config/linux/lock.c b/libgomp/config/linux/lock.c index 7c478693077..a2e07d320fd 100644 --- a/libgomp/config/linux/lock.c +++ b/libgomp/config/linux/lock.c @@ -234,7 +234,7 @@ gomp_test_nest_lock_25 (omp_nest_lock_25_t *lock) omp_lock_symver (omp_init_lock) omp_lock_symver (omp_destroy_lock) -omp_lock_symver (omp_set_lock) +omp_lock_symver (omp_set_lock) omp_lock_symver (omp_unset_lock) omp_lock_symver (omp_test_lock) omp_lock_symver (omp_init_nest_lock) diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h index c9ceb0bde44..66180122c1e 100644 --- a/libgomp/libgomp.h +++ b/libgomp/libgomp.h @@ -339,7 +339,7 @@ struct gomp_thread /* This semaphore is used for ordered loops. */ gomp_sem_t release; - /* user pthread thread pool */ + /* user pthread thread pool */ struct gomp_thread_pool *thread_pool; }; |