diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-12-28 23:29:35 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-12-28 23:29:35 +0100 |
commit | 97812ff0d30c2fd5c93791a63a941d0960a64b69 (patch) | |
tree | 1ea689594ada936cd1bdc9f024dc0286e3db4158 /Eigen | |
parent | 7713e20fd2f673091807dd7f5b3864ac8aef17f2 (diff) |
bug #1369: fix type mismatch warning.
Returned values of omp thread id and numbers are int,
o let's use int instead of Index here.
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Core/products/GeneralMatrixMatrix.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h index 61df3be57..6440e1d09 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h @@ -83,8 +83,8 @@ static void run(Index rows, Index cols, Index depth, if(info) { // this is the parallel version! - Index tid = omp_get_thread_num(); - Index threads = omp_get_num_threads(); + int tid = omp_get_thread_num(); + int threads = omp_get_num_threads(); LhsScalar* blockA = blocking.blockA(); eigen_internal_assert(blockA!=0); @@ -116,9 +116,9 @@ static void run(Index rows, Index cols, Index depth, info[tid].sync = k; // Computes C_i += A' * B' per A'_i - for(Index shift=0; shift<threads; ++shift) + for(int shift=0; shift<threads; ++shift) { - Index i = (tid+shift)%threads; + int i = (tid+shift)%threads; // At this point we have to make sure that A'_i has been updated by the thread i, // we use testAndSetOrdered to mimic a volatile access. |