Merge pull request #12264 from mathsen/preparation_gcc_11

author Wolfgang Bangerth <bangerth@colostate.edu>

Thu, 20 May 2021 19:21:06 +0000 (13:21 -0600)

committer GitHub <noreply@github.com>

Thu, 20 May 2021 19:21:06 +0000 (13:21 -0600)
author Wolfgang Bangerth <bangerth@colostate.edu>
Thu, 20 May 2021 19:21:06 +0000 (13:21 -0600)
committer GitHub <noreply@github.com>
Thu, 20 May 2021 19:21:06 +0000 (13:21 -0600)
diff --cc examples/step-19/step-19.cc
Simple merge
diff --cc include/deal.II/matrix_free/shape_info.templates.h
Simple merge
diff --cc source/numerics/derivative_approximation.cc
Simple merge
author	Wolfgang Bangerth <bangerth@colostate.edu>
	Thu, 20 May 2021 19:21:06 +0000 (13:21 -0600)
committer	GitHub <noreply@github.com>
	Thu, 20 May 2021 19:21:06 +0000 (13:21 -0600)
		1	2
examples/step-19/step-19.cc	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/matrix_free/shape_info.templates.h	patch \|	diff1 \|	diff2 \|	blob \| history
source/numerics/derivative_approximation.cc	patch \|	diff1 \|	diff2 \|	blob \| history