From: Wolfgang Bangerth Date: Sun, 10 May 2015 14:07:21 +0000 (-0500) Subject: Ensure that the new generic FEValues code also compiles in non-C++11 mode. X-Git-Tag: v8.3.0-rc1~183^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcdb463199b4eb367946af4ac5cb2f560f96c25b;p=dealii.git Ensure that the new generic FEValues code also compiles in non-C++11 mode. --- diff --git a/source/fe/fe_values.inst.in b/source/fe/fe_values.inst.in index c741cae5bc..421d7dcc9c 100644 --- a/source/fe/fe_values.inst.in +++ b/source/fe/fe_values.inst.in @@ -74,11 +74,11 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimensi template void FEValuesViews::Scalar ::get_function_gradients - (const dealii::VEC&, std::vector>::type>&) const; + (const dealii::VEC&, std::vector >::type>&) const; template void FEValuesViews::Scalar ::get_function_hessians - (const dealii::VEC&, std::vector>::type>&) const; + (const dealii::VEC&, std::vector >::type>&) const; template void FEValuesViews::Scalar ::get_function_laplacians @@ -87,15 +87,15 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimensi template void FEValuesViews::Vector ::get_function_values - (const dealii::VEC&, std::vector>::type >&) const; + (const dealii::VEC&, std::vector >::type >&) const; template void FEValuesViews::Vector ::get_function_gradients - (const dealii::VEC&, std::vector>::type >&) const; + (const dealii::VEC&, std::vector >::type >&) const; template void FEValuesViews::Vector ::get_function_symmetric_gradients - (const dealii::VEC&, std::vector>::type >&) const; + (const dealii::VEC&, std::vector >::type >&) const; template void FEValuesViews::Vector ::get_function_curls @@ -107,11 +107,11 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimensi template void FEValuesViews::Vector ::get_function_hessians - (const dealii::VEC&, std::vector>::type >&) const; + (const dealii::VEC&, std::vector >::type >&) const; template void FEValuesViews::Vector ::get_function_laplacians - (const dealii::VEC&, std::vector>::type >&) const; + (const dealii::VEC&, std::vector >::type >&) const; template void FEValuesViews::SymmetricTensor<2, deal_II_dimension, deal_II_space_dimension> diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index 331296a8d8..58c4afc9cd 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -249,14 +249,14 @@ namespace DerivativeApproximation { if (fe_values.get_fe().n_components() == 1) { - std::vector> values (1); + std::vector > values (1); fe_values.get_function_gradients (solution, values); return ProjectedDerivative(values[0]); } else { - std::vector> > values - (1, std::vector>(fe_values.get_fe().n_components())); + std::vector > > values + (1, std::vector >(fe_values.get_fe().n_components())); fe_values.get_function_gradients (solution, values); return ProjectedDerivative(values[0][component]); }; @@ -592,14 +592,14 @@ namespace DerivativeApproximation { if (fe_values.get_fe().n_components() == 1) { - std::vector> values (1); + std::vector > values (1); fe_values.get_function_hessians (solution, values); return ProjectedDerivative(values[0]); } else { - std::vector> > values - (1, std::vector>(fe_values.get_fe().n_components())); + std::vector > > values + (1, std::vector >(fe_values.get_fe().n_components())); fe_values.get_function_hessians (solution, values); return ProjectedDerivative(values[0][component]); };