From 3f834635f91f096395ac04b3059b27840fabefa7 Mon Sep 17 00:00:00 2001 From: hartmann Date: Fri, 16 Jun 2006 08:46:57 +0000 Subject: [PATCH] Remove inlines to avoid icc8's undefined reference to DoFObjects::n_active_fe_indices. Clean up. git-svn-id: https://svn.dealii.org/trunk@13264 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_objects.cc | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_objects.cc b/deal.II/deal.II/source/dofs/dof_objects.cc index 94058d1b92..3bf6313bf7 100644 --- a/deal.II/deal.II/source/dofs/dof_objects.cc +++ b/deal.II/deal.II/source/dofs/dof_objects.cc @@ -31,10 +31,9 @@ namespace internal template template - inline unsigned int DoFObjects::n_active_fe_indices (const ::DoFHandler &, - const unsigned) const + const unsigned) const { return 1; } @@ -42,11 +41,10 @@ namespace internal template template - inline bool DoFObjects::fe_index_is_active (const ::DoFHandler &, - const unsigned int, - const unsigned int fe_index) const + const unsigned int, + const unsigned int fe_index) const { Assert (fe_index == 0, ExcMessage ("Only zero fe_index values are allowed for " @@ -125,11 +123,8 @@ namespace internal } // explicit instantiations - template - unsigned int - DoFObjects<1>:: - memory_consumption () const; - + + template class DoFObjects<1>; template unsigned int @@ -163,11 +158,7 @@ namespace internal #if deal_II_dimension >= 2 - template - unsigned int - DoFObjects<2>:: - memory_consumption () const; - + template class DoFObjects<2>; template unsigned int @@ -203,11 +194,7 @@ namespace internal #if deal_II_dimension >= 3 - template - unsigned int - DoFObjects<3>:: - memory_consumption () const; - + template class DoFObjects<3>; template unsigned int -- 2.39.5