From: heister Date: Sat, 23 Oct 2010 19:07:29 +0000 (+0000) Subject: more compilation fixes. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e4e497fcc8aeb40796512d61932cfb562c79216;p=dealii-svn.git more compilation fixes. git-svn-id: https://svn.dealii.org/trunk@22441 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index fac5c18221..bb75944abc 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -1176,6 +1176,7 @@ estimate (const Mapping<1,spacedim> &mapping, const types::subdomain_id_t subdomain_id_, const unsigned int material_id) { +#ifdef DEAL_II_USE_P4EST if (dynamic_cast*> (&dof_handler.get_tria()) != 0) @@ -1197,7 +1198,10 @@ estimate (const Mapping<1,spacedim> &mapping, (dof_handler.get_tria()).locally_owned_subdomain() : subdomain_id_); - +#else + const types::subdomain_id_t subdomain_id + = subdomain_id_; +#endif const unsigned int n_components = dof_handler.get_fe().n_components(); const unsigned int n_solution_vectors = solutions.size(); @@ -1537,6 +1541,7 @@ estimate (const Mapping &mapping, const types::subdomain_id_t subdomain_id_, const unsigned int material_id) { +#ifdef DEAL_II_USE_P4EST if (dynamic_cast*> (&dof_handler.get_tria()) != 0) @@ -1558,7 +1563,10 @@ estimate (const Mapping &mapping, (dof_handler.get_tria()).locally_owned_subdomain() : subdomain_id_); - +#else + const types::subdomain_id_t subdomain_id + = subdomain_id_; +#endif const unsigned int n_components = dof_handler.get_fe().n_components();