From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 21 Feb 2003 16:13:36 +0000 (+0000)
Subject: Undo last change. While technically correct and preventing an ICE in gcc CVS, it... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ac8c1c2403016d7174dbea6aee08f3f59d24a35;p=dealii-svn.git

Undo last change. While technically correct and preventing an ICE in gcc CVS, it generates an ICE in gcc2.96. Umpf. I think it will be fixed in 3.4 soon, so let's lean on the side of 2.96.


git-svn-id: https://svn.dealii.org/trunk@7210 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc
index 9b9b75104e..d830740156 100644
--- a/deal.II/deal.II/source/fe/fe.cc
+++ b/deal.II/deal.II/source/fe/fe.cc
@@ -405,11 +405,11 @@ FiniteElementBase<dim>::memory_consumption () const
 {
   return (sizeof(FiniteElementData<dim>) +
 	  MemoryConsumption::
-	  memory_consumption<FullMatrix<double>,
-                             GeometryInfo<dim>::children_per_cell>(restriction)+
-	  MemoryConsumption::
-          memory_consumption<FullMatrix<double>,
-                             GeometryInfo<dim>::children_per_cell>(prolongation) +
+	  memory_consumption<FullMatrix<double>, sizeof(restriction)/sizeof(restriction[0])>
+	  (restriction)+
+	  MemoryConsumption::memory_consumption
+	  <FullMatrix<double>, sizeof(prolongation)/sizeof(prolongation[0])>
+	  (prolongation) +
 	  MemoryConsumption::memory_consumption (interface_constraints) +
 	  MemoryConsumption::memory_consumption (system_to_component_table) +
 	  MemoryConsumption::memory_consumption (face_system_to_component_table) +