From 5cad8e887213ded06dc5d7f896e430b79e9b7e08 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sat, 28 Nov 2015 08:30:15 -0500 Subject: [PATCH] MSVC fix for fe_evaluation It looks like MSVC struggles with operator? in template parameters unless you wrap them in parenthesis. --- include/deal.II/matrix_free/fe_evaluation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index fa52f5e670..9a70083aa9 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -4098,13 +4098,13 @@ FEEvaluationAccess template inline -Tensor<1,dim==2?1:dim,VectorizedArray > +Tensor<1,(dim==2?1:dim),VectorizedArray > FEEvaluationAccess ::get_curl (const unsigned int q_point) const { // copy from generic function into dim-specialization function const Tensor<2,dim,VectorizedArray > grad = get_gradient(q_point); - Tensor<1,dim==2?1:dim,VectorizedArray > curl; + Tensor<1,(dim==2?1:dim),VectorizedArray > curl; switch (dim) { case 1: -- 2.39.5