From: Wolfgang Bangerth 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-Tag: v8.0.0~16867 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=226a06502713caf1b70e89a1ba21e8901676a0d2;p=dealii.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::memory_consumption () const { return (sizeof(FiniteElementData) + MemoryConsumption:: - memory_consumption, - GeometryInfo::children_per_cell>(restriction)+ - MemoryConsumption:: - memory_consumption, - GeometryInfo::children_per_cell>(prolongation) + + memory_consumption, sizeof(restriction)/sizeof(restriction[0])> + (restriction)+ + MemoryConsumption::memory_consumption + , 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) +