From: Karl Ljungkvist Date: Wed, 23 Nov 2016 13:46:35 +0000 (+0100) Subject: make instantiations fulfill chartdim<=spacedim X-Git-Tag: v8.5.0-rc1~369^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3628%2Fhead;p=dealii.git make instantiations fulfill chartdim<=spacedim --- diff --git a/source/grid/manifold.inst.in b/source/grid/manifold.inst.in index 3cd1d67db9..4f2cea5dc5 100644 --- a/source/grid/manifold.inst.in +++ b/source/grid/manifold.inst.in @@ -20,12 +20,14 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS #if deal_II_dimension <= deal_II_space_dimension template class Manifold; template class FlatManifold; - - template class ChartManifold; - template class ChartManifold; - template class ChartManifold; #endif } - - +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; deal_II_chart_dimension : DIMENSIONS) +{ +#if deal_II_dimension <= deal_II_space_dimension +#if deal_II_chart_dimension <= deal_II_space_dimension + template class ChartManifold; +#endif +#endif +} diff --git a/source/grid/manifold_lib.inst.in b/source/grid/manifold_lib.inst.in index 876da5d0ff..cbb1aeae3b 100644 --- a/source/grid/manifold_lib.inst.in +++ b/source/grid/manifold_lib.inst.in @@ -20,12 +20,17 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS template class PolarManifold; template class SphericalManifold; template class CylindricalManifold; - template class FunctionManifold; - template class FunctionManifold; - template class FunctionManifold; #endif #if deal_II_dimension == deal_II_space_dimension template class TorusManifold; #endif } +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; deal_II_chart_dimension : DIMENSIONS) +{ +#if deal_II_dimension <= deal_II_space_dimension +#if deal_II_chart_dimension <= deal_II_space_dimension + template class FunctionManifold; +#endif +#endif +}