From 6e4a98cfe006ecf33c1fc722060086a1b7a198a7 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sat, 5 Apr 2014 15:03:29 +0000 Subject: [PATCH] Fix undefined symbol CellAccessor<3,2>::subdomain_id that appears for some compilers due to r32708 by making a very simple function inline git-svn-id: https://svn.dealii.org/trunk@32718 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/grid/tria_accessor.templates.h | 12 ++++++++++++ deal.II/source/grid/tria_accessor.cc | 10 ---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h index 19bb7ad61a..cdfd33e40a 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.templates.h +++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h @@ -2952,6 +2952,18 @@ CellAccessor::is_artificial () const +template +inline +types::subdomain_id +CellAccessor::subdomain_id () const +{ + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); + Assert (this->active(), ExcMessage("subdomains only work on active cells!")); + return this->tria->levels[this->present_level]->subdomain_ids[this->present_index]; +} + + + template inline unsigned int diff --git a/deal.II/source/grid/tria_accessor.cc b/deal.II/source/grid/tria_accessor.cc index 3050f7448d..395ad3a35d 100644 --- a/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/source/grid/tria_accessor.cc @@ -1330,16 +1330,6 @@ void CellAccessor::recursively_set_material_id (const types::mate -template -types::subdomain_id CellAccessor::subdomain_id () const -{ - Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); - Assert (this->active(), ExcMessage("subdomains only work on active cells!")); - return this->tria->levels[this->present_level]->subdomain_ids[this->present_index]; -} - - - template void CellAccessor::set_subdomain_id (const types::subdomain_id new_subdomain_id) const -- 2.39.5