From: Bruno Turcksin Date: Thu, 21 Apr 2016 18:39:40 +0000 (-0400) Subject: Fix a bug when using 64 bit indices. X-Git-Tag: v8.5.0-rc1~1086^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9a63a57ddb5ab54a61d4807e762efaf0f4a1c39;p=dealii.git Fix a bug when using 64 bit indices. --- diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h index 8be3c304d7..d23c303352 100644 --- a/include/deal.II/lac/vector.templates.h +++ b/include/deal.II/lac/vector.templates.h @@ -140,7 +140,8 @@ namespace internal { // set chunk size for sub-tasks const unsigned int gs = internal::Vector::minimum_parallel_grain_size; - n_chunks = std::min(4*MultithreadInfo::n_threads(), vec_size / gs); + n_chunks = std::min(static_cast(4*MultithreadInfo::n_threads()), + vec_size / gs); chunk_size = vec_size / n_chunks; // round to next multiple of 512 (or minimum grain size if that happens @@ -989,7 +990,8 @@ namespace internal { // set chunk size for sub-tasks const unsigned int gs = internal::Vector::minimum_parallel_grain_size; - n_chunks = std::min(4*MultithreadInfo::n_threads(), vec_size / gs); + n_chunks = std::min(static_cast(4*MultithreadInfo::n_threads()), + vec_size / gs); chunk_size = vec_size / n_chunks; // round to next multiple of 512 (or leave it at the minimum grain size