From 4b366b249f577efced65b58fe26c3e3d11616323 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 11 Dec 2012 16:35:28 +0000 Subject: [PATCH] Forgot to commit this change for the previous commit git-svn-id: https://svn.dealii.org/branches/branch_cmake@27791 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/fe_system.cc | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/deal.II/source/fe/fe_system.cc b/deal.II/source/fe/fe_system.cc index 5854d2c3dd..04e146d73c 100644 --- a/deal.II/source/fe/fe_system.cc +++ b/deal.II/source/fe/fe_system.cc @@ -973,39 +973,31 @@ FESystem::compute_fill ( } } - // fill_fe_face_values needs - // argument Quadrature - // for both cases - // dim_1==dim-1 and - // dim_1=dim. Hence the - // following workaround + // fill_fe_face_values needs argument Quadrature for both + // cases dim_1==dim-1 and dim_1=dim. Hence the following workaround const Quadrature *cell_quadrature = 0; const Quadrature *face_quadrature = 0; - // static cast to the - // common base class of - // quadrature being either - // Quadrature or - // Quadrature: - const Subscriptor *quadrature_base_pointer = &quadrature; + // static cast to the common base class of quadrature being either + // Quadrature or Quadrature: if (face_no==invalid_face_number) { Assert(dim_1==dim, ExcDimensionMismatch(dim_1,dim)); - Assert (dynamic_cast *>(quadrature_base_pointer) != 0, + Assert (dynamic_cast *>(&quadrature) != 0, ExcInternalError()); cell_quadrature - = static_cast *>(quadrature_base_pointer); + = reinterpret_cast *>(&quadrature); } else { Assert(dim_1==dim-1, ExcDimensionMismatch(dim_1,dim-1)); - Assert (dynamic_cast *>(quadrature_base_pointer) != 0, + Assert (dynamic_cast *>(&quadrature) != 0, ExcInternalError()); face_quadrature - = static_cast *>(quadrature_base_pointer); + = reinterpret_cast *>(&quadrature); } // let base elements update the -- 2.39.5