From: bangerth Date: Wed, 29 Nov 2006 06:04:28 +0000 (+0000) Subject: Move the file to an .all_dimensions.cc file and always instantiate all templates... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd6749b6039eb43647abc9799b9969306c2ee40;p=dealii-svn.git Move the file to an .all_dimensions.cc file and always instantiate all templates. We need them for all structdim<=dim anyway, but since we instantiate the same function in several libraries right now, we get into trouble on systems with not-so-smart linkers, for example on mac os x. git-svn-id: https://svn.dealii.org/trunk@14214 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/hp_dof_objects.cc b/deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc similarity index 81% rename from deal.II/deal.II/source/dofs/hp_dof_objects.cc rename to deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc index 3fbbe635eb..2db13eb238 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_objects.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc @@ -14,13 +14,9 @@ #include #include -#include -#include DEAL_II_NAMESPACE_OPEN -//TODO: Several of the functions in this file are identical. some template trickery should make it possible to merge them - namespace internal { namespace hp @@ -40,24 +36,15 @@ namespace internal DoFObjects<1>:: memory_consumption () const; -#if deal_II_dimension >= 2 - template unsigned int DoFObjects<2>:: memory_consumption () const; -#endif - - -#if deal_II_dimension >= 3 - template unsigned int DoFObjects<3>:: memory_consumption () const; - -#endif } }