Keep the old data types in declarations and only use the workaround for MS Visual...

diff --git a/include/deal.II/numerics/derivative_approximation.h b/include/deal.II/numerics/derivative_approximation.h
index 1d48ba1e869a780d90c46bca94040910ba7ed4c2..875cbcb10195e19a5220390e6f21c195128876e8 100644 (file)
--- 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<dim, spacedim> &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<order, dim>  &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<order, dim>                  &derivative,
                                 const unsigned int                            component = 0);
 

diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc
index daecca9c040c9926430c0958ba5adb15694fdff0..23e568a545089dd5183764600a2845acd4cac3d5 100644 (file)
--- a/source/numerics/derivative_approximation.cc
+++ b/source/numerics/derivative_approximation.cc
@@ -1075,7 +1075,11 @@ namespace DerivativeApproximation
   approximate_derivative_tensor(const Mapping<dim, spacedim> &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<order, dim>  &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<order, dim>                  &derivative,
                                 const unsigned int                            component)
   {