From: Ralf Hartmann Date: Fri, 10 Feb 2006 12:52:40 +0000 (+0000) Subject: Replace MappingCollection::get_mapping() and n_mappings() by operator[] and size() X-Git-Tag: v8.0.0~12385 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eceffd1ef1784a41daabebe3e59070fde8c70b4;p=dealii.git Replace MappingCollection::get_mapping() and n_mappings() by operator[] and size() git-svn-id: https://svn.dealii.org/trunk@12294 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/mapping_collection.h b/deal.II/deal.II/include/fe/mapping_collection.h index e53b1b4e65..8495ac566c 100644 --- a/deal.II/deal.II/include/fe/mapping_collection.h +++ b/deal.II/deal.II/include/fe/mapping_collection.h @@ -68,7 +68,7 @@ namespace hp * Returns the number of mapping * objects stored in this container. */ - unsigned int n_mappings () const; + unsigned int size () const; /** * Returns the mapping object which @@ -81,7 +81,7 @@ namespace hp * collection. */ const Mapping & - get_mapping (const unsigned int index) const; + operator[] (const unsigned int index) const; /** * Determine an estimate for the @@ -132,7 +132,7 @@ namespace hp template inline unsigned int - MappingCollection::n_mappings () const + MappingCollection::size () const { return mappings.size(); } diff --git a/deal.II/deal.II/source/fe/hp_fe_values.cc b/deal.II/deal.II/source/fe/hp_fe_values.cc index 41eb74f27e..57fd2d934a 100644 --- a/deal.II/deal.II/source/fe/hp_fe_values.cc +++ b/deal.II/deal.II/source/fe/hp_fe_values.cc @@ -129,7 +129,7 @@ namespace hp const unsigned int active_fe_index) const { return new ::FEValues ( - this->mapping_collection.get_mapping (active_fe_index), fe, + this->mapping_collection[active_fe_index], fe, this->q_collection[active_fe_index], this->update_flags); } @@ -186,7 +186,7 @@ namespace hp const unsigned int active_fe_index) const { return new ::FEFaceValues ( - this->mapping_collection.get_mapping (active_fe_index), fe, + this->mapping_collection[active_fe_index], fe, this->q_collection[active_fe_index], this->update_flags); } @@ -245,7 +245,7 @@ namespace hp const unsigned int active_fe_index) const { return new ::FESubfaceValues ( - this->mapping_collection.get_mapping (active_fe_index), fe, + this->mapping_collection[active_fe_index], fe, this->q_collection[active_fe_index], this->update_flags); } } diff --git a/deal.II/deal.II/source/fe/mapping_collection.cc b/deal.II/deal.II/source/fe/mapping_collection.cc index 2d912c6992..3361a0ff31 100644 --- a/deal.II/deal.II/source/fe/mapping_collection.cc +++ b/deal.II/deal.II/source/fe/mapping_collection.cc @@ -37,7 +37,7 @@ namespace hp template inline const Mapping & - MappingCollection::get_mapping (const unsigned int index) const + MappingCollection::operator[] (const unsigned int index) const { if (single_mapping) return *mappings[0];