From: alex Date: Sat, 25 Feb 2017 14:44:27 +0000 (+0300) Subject: fix for read_write_vector.templates.h to compile under Windows X-Git-Tag: v8.5.0-rc1~94^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98b3a78167cc3af692f7dc00f975ff0a20f5652;p=dealii.git fix for read_write_vector.templates.h to compile under Windows --- diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index bb0926cb8b..e9ad460021 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -63,7 +63,7 @@ namespace LinearAlgebra free(val); Utilities::System::posix_memalign ((void **)&val, 64, sizeof(Number)*new_alloc_size); - if (new_alloc_size >= 4*internal::Vector::minimum_parallel_grain_size) + if (new_alloc_size >= 4*dealii::internal::Vector::minimum_parallel_grain_size) thread_loop_partitioner.reset(new parallel::internal::TBBPartitioner()); } } @@ -158,7 +158,7 @@ namespace LinearAlgebra reinit(in_vector, true); dealii::internal::VectorOperations::Vector_copy copier(in_vector.val, val); - internal::VectorOperations::parallel_for(copier, n_elements(), thread_loop_partitioner); + dealii::internal::VectorOperations::parallel_for(copier, n_elements(), thread_loop_partitioner); return *this; } @@ -175,7 +175,7 @@ namespace LinearAlgebra reinit(in_vector, true); dealii::internal::VectorOperations::Vector_copy copier(in_vector.val, val); - internal::VectorOperations::parallel_for(copier, n_elements(), thread_loop_partitioner); + dealii::internal::VectorOperations::parallel_for(copier, n_elements(), thread_loop_partitioner); return *this; } @@ -189,8 +189,8 @@ namespace LinearAlgebra Assert(s==static_cast(0), ExcMessage("Only 0 can be assigned to a vector.")); (void)s; - internal::VectorOperations::Vector_set setter(Number(), val); - internal::VectorOperations::parallel_for(setter, n_elements(), thread_loop_partitioner); + dealii::internal::VectorOperations::Vector_set setter(Number(), val); + dealii::internal::VectorOperations::parallel_for(setter, n_elements(), thread_loop_partitioner); return *this; }