From 8090d98f5fc5da4a5d8827fa4e69f4d47b7a19e0 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 1 Nov 2012 02:08:41 +0000 Subject: [PATCH] Remove a #ifdef that was introduced in r20239 when we still had multiple libraries. The conditional was to work around a problem on Mac OS X where RTTI doesn't work across shared libraries. The code in question should work now without the workaround simply because at least in this part we no longer do RTTI across shared libs. The problem may still exist at the interface between the deal.II shared libs and user code. git-svn-id: https://svn.dealii.org/trunk@27276 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/fe_system.cc | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/deal.II/source/fe/fe_system.cc b/deal.II/source/fe/fe_system.cc index 6579fb6cc8..faf1f3dd08 100644 --- a/deal.II/source/fe/fe_system.cc +++ b/deal.II/source/fe/fe_system.cc @@ -998,34 +998,18 @@ FESystem::compute_fill ( if (face_no==invalid_face_number) { Assert(dim_1==dim, ExcDimensionMismatch(dim_1,dim)); - - // Some Mac OS X versions - // have a bug that makes - // the following assertion - // fail spuriously. In that - // case, just disable the - // Assert, as this is not - // something that depends - // on input parameters - // provided by users; the - // validity of the - // assertion is still - // checked on all systems - // that don't have this bug -#ifndef DEAL_II_HAVE_DARWIN_DYNACAST_BUG Assert (dynamic_cast *>(quadrature_base_pointer) != 0, ExcInternalError()); -#endif + cell_quadrature = static_cast *>(quadrature_base_pointer); } else { Assert(dim_1==dim-1, ExcDimensionMismatch(dim_1,dim-1)); -#ifndef DEAL_II_HAVE_DARWIN_DYNACAST_BUG Assert (dynamic_cast *>(quadrature_base_pointer) != 0, ExcInternalError()); -#endif + face_quadrature = static_cast *>(quadrature_base_pointer); } -- 2.39.5