From: Wolfgang Bangerth Date: Thu, 7 Aug 2014 05:40:59 +0000 (-0500) Subject: Fix missing instantiations. X-Git-Tag: v8.2.0-rc1~221^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F60%2Fhead;p=dealii.git Fix missing instantiations. Eric Heien reports that he can't compile deal.II on one Mac machine with missing symbols. I think we just forgot to instantiate them. --- diff --git a/source/grid/tria_objects.cc b/source/grid/tria_objects.cc index 13eac3c181..a61c028abb 100644 --- a/source/grid/tria_objects.cc +++ b/source/grid/tria_objects.cc @@ -242,9 +242,6 @@ namespace internal } - - - void TriaObjectsHex::reserve_space (const unsigned int new_hexes) { diff --git a/source/grid/tria_objects.inst.in b/source/grid/tria_objects.inst.in index 4f8448ed55..f022524fca 100644 --- a/source/grid/tria_objects.inst.in +++ b/source/grid/tria_objects.inst.in @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2006 - 2013 by the deal.II authors +// Copyright (C) 2006 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -17,8 +17,7 @@ for (deal_II_dimension : DIMENSIONS) { -#if deal_II_dimension > 1 - +#if deal_II_dimension >= 2 template dealii::TriaRawIterator > TriaObjects >::next_free_single_object (const dealii::Triangulation &tria); template dealii::TriaRawIterator > @@ -28,7 +27,13 @@ for (deal_II_dimension : DIMENSIONS) template dealii::TriaRawIterator > TriaObjects >::next_free_pair_object (const dealii::Triangulation &tria); #endif -#if deal_II_dimension == 3 + +#if deal_II_dimension >= 3 + template dealii::TriaRawIterator > + TriaObjects >::next_free_single_object (const dealii::Triangulation &tria); + template dealii::TriaRawIterator > + TriaObjects >::next_free_pair_object (const dealii::Triangulation &tria); + template dealii::Triangulation::raw_hex_iterator TriaObjects >::next_free_hex(const dealii::Triangulation &, const unsigned int); #endif