From 19bde1de76f84a3425840fe5ea16d7071e3dde1e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 4 Dec 2014 10:46:19 -0600 Subject: [PATCH] Keep the old data types in declarations and only use the workaround for MS Visual Studio. --- include/deal.II/numerics/derivative_approximation.h | 8 ++++++++ source/numerics/derivative_approximation.cc | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/include/deal.II/numerics/derivative_approximation.h b/include/deal.II/numerics/derivative_approximation.h index 1d48ba1e86..875cbcb101 100644 --- a/include/deal.II/numerics/derivative_approximation.h +++ b/include/deal.II/numerics/derivative_approximation.h @@ -274,7 +274,11 @@ namespace DerivativeApproximation approximate_derivative_tensor(const Mapping &mapping, const DH &dof, const InputVector &solution, +#ifndef _MSC_VER + const typename DH::active_cell_iterator &cell, +#else const TriaActiveIterator < dealii::DoFCellAccessor < DH, false > > &cell, +#endif Tensor &derivative, const unsigned int component = 0); @@ -285,7 +289,11 @@ namespace DerivativeApproximation void approximate_derivative_tensor(const DH &dof, const InputVector &solution, +#ifndef _MSC_VER + const typename DH::active_cell_iterator &cell, +#else const TriaActiveIterator < dealii::DoFCellAccessor < DH, false > > &cell, +#endif Tensor &derivative, const unsigned int component = 0); diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index daecca9c04..23e568a545 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -1075,7 +1075,11 @@ namespace DerivativeApproximation approximate_derivative_tensor(const Mapping &mapping, const DH &dof, const InputVector &solution, +#ifndef _MSC_VER + const typename DH::active_cell_iterator &cell, +#else const TriaActiveIterator < dealii::DoFCellAccessor < DH, false > > &cell, +#endif Tensor &derivative, const unsigned int component) { @@ -1094,7 +1098,11 @@ namespace DerivativeApproximation void approximate_derivative_tensor(const DH &dof, const InputVector &solution, +#ifndef _MSC_VER + const typename DH::active_cell_iterator &cell, +#else const TriaActiveIterator < dealii::DoFCellAccessor < DH, false > > &cell, +#endif Tensor &derivative, const unsigned int component) { -- 2.39.5