From 3f2081a6b3d7cc6a0387c40301e0007f05371487 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 14 Jan 2020 18:01:43 -0700 Subject: [PATCH] Fix the instantiations of GridOut::write_svg(). By accident, we didn't instantiate the <3,3> case and users consequently get funny linker errors that they have a hard time interpreting. Fix this. --- source/grid/grid_out.inst.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/grid/grid_out.inst.in b/source/grid/grid_out.inst.in index 7af8cf2311..b9d843ac1c 100644 --- a/source/grid/grid_out.inst.in +++ b/source/grid/grid_out.inst.in @@ -24,11 +24,6 @@ for (deal_II_dimension : DIMENSIONS) const Triangulation &, std::ostream &) const; #endif -#if deal_II_dimension != 2 - template void GridOut::write_svg(const Triangulation &, - std::ostream &) const; -#endif - template void GridOut::write_msh(const Triangulation &, std::ostream &) const; @@ -72,13 +67,18 @@ for (deal_II_dimension : DIMENSIONS) for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { -#if deal_II_dimension < deal_II_space_dimension - -# if deal_II_dimension != 2 +#if deal_II_dimension <= deal_II_space_dimension + // Instantiate write_svg exception for the <2,2> case for which there + // is an overload that takes care of that case. +# if !(deal_II_dimension == 2 && deal_II_space_dimension == 2) template void GridOut::write_svg( const Triangulation &, std::ostream &) const; # endif +#endif + + +#if deal_II_dimension < deal_II_space_dimension template void GridOut::write_msh( const Triangulation &, -- 2.39.5