Reapply a patch that would otherwise have been lost in a rebase.

diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc
index 53534ffb3bc1e8dbf09e7d1f3165582a0242528f..5fe49778e6197e4081ea7b1db0bf87558c84444b 100644 (file)
--- a/source/fe/mapping_q_generic.cc
+++ b/source/fe/mapping_q_generic.cc
@@ -1215,8 +1215,8 @@ namespace internal
                             for (unsigned int jr=0; jr<dim; ++jr)
                               for (unsigned int lr=0; lr<dim; ++lr)
                                 {
-                                  const unsigned int mr_start = (jr+lr == 0)? 1:0;
-                                  for (unsigned int mr=0; mr<mr_start; ++mr)
+                                  const unsigned int mr0 = (jr+lr == 0)? 1:0;
+                                  for (unsigned int mr=mr0; mr<dim; ++mr)
                                     jacobian_pushed_forward_2nd_derivatives[point][i][j][l][m]
                                     += result[i][jr][lr][mr] *
                                        data.covariant[point][j][jr] *
@@ -1342,8 +1342,8 @@ namespace internal
                                 for (unsigned int lr=0; lr<dim; ++lr)
                                   for (unsigned int mr=0; mr<dim; ++mr)
                                     {
-                                      const unsigned int nr_start = (jr+lr+mr==0)? 1:0;
-                                      for (unsigned int nr=0; nr<nr_start; ++nr)
+                                      const unsigned int nr0 = (jr+lr+mr==0)? 1:0;
+                                      for (unsigned int nr=nr0; nr<dim; ++nr)
                                         jacobian_pushed_forward_3rd_derivatives[point][i][j][l][m][n]
                                         += result[i][jr][lr][mr][nr] *
                                            data.covariant[point][j][jr] *