From: Wolfgang Bangerth Date: Wed, 28 Apr 2021 23:47:02 +0000 (-0600) Subject: Do not redefine functions that we can import from the base class. X-Git-Tag: v9.3.0-rc1~160^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12112%2Fhead;p=dealii.git Do not redefine functions that we can import from the base class. --- diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index a5a951b73d..b65d1e23de 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -767,18 +767,9 @@ public: operator()(const size_type i); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::reference - operator()(const TableIndices<1> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::const_reference - operator()(const TableIndices<1> &indices) const; + using TableBase<1, T>::operator(); }; @@ -1242,19 +1233,9 @@ public: operator()(const size_type i, const size_type j); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::reference - operator()(const TableIndices<2> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::const_reference - operator()(const TableIndices<2> &indices) const; - + using TableBase<2, T>::operator(); /** * Number of rows. This function really makes only sense since we have a @@ -1455,18 +1436,9 @@ public: operator()(const size_type i, const size_type j, const size_type k); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::reference - operator()(const TableIndices<3> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::const_reference - operator()(const TableIndices<3> &indices) const; + using TableBase<3, T>::operator(); }; @@ -1548,18 +1520,9 @@ public: const size_type l); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::reference - operator()(const TableIndices<4> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::const_reference - operator()(const TableIndices<4> &indices) const; + using TableBase<4, T>::operator(); }; @@ -1644,18 +1607,9 @@ public: const size_type m); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::reference - operator()(const TableIndices<5> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::const_reference - operator()(const TableIndices<5> &indices) const; + using TableBase<5, T>::operator(); }; @@ -1742,18 +1696,9 @@ public: const size_type n); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::reference - operator()(const TableIndices<6> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::const_reference - operator()(const TableIndices<6> &indices) const; + using TableBase<6, T>::operator(); }; @@ -1842,18 +1787,9 @@ public: const size_type o); /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. + * Make the variations of `operator()` from the base class available. */ - typename AlignedVector::reference - operator()(const TableIndices<7> &indices); - - /** - * Make the corresponding operator () from the TableBase base class - * available also in this class. - */ - typename AlignedVector::const_reference - operator()(const TableIndices<7> &indices) const; + using TableBase<7, T>::operator(); }; @@ -2578,24 +2514,6 @@ Table<1, T>::operator()(const size_type i) } - -template -inline typename AlignedVector::const_reference -Table<1, T>::operator()(const TableIndices<1> &indices) const -{ - return TableBase<1, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<1, T>::operator()(const TableIndices<1> &indices) -{ - return TableBase<1, T>::operator()(indices); -} - - //--------------------------------------------------------------------------- @@ -2674,24 +2592,6 @@ Table<2, T>::operator()(const size_type i, const size_type j) -template -inline typename AlignedVector::const_reference -Table<2, T>::operator()(const TableIndices<2> &indices) const -{ - return TableBase<2, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<2, T>::operator()(const TableIndices<2> &indices) -{ - return TableBase<2, T>::operator()(indices); -} - - - template inline typename AlignedVector::const_reference Table<2, T>::el(const size_type i, const size_type j) const @@ -3216,24 +3116,6 @@ Table<3, T>::operator()(const size_type i, const size_type j, const size_type k) -template -inline typename AlignedVector::const_reference -Table<3, T>::operator()(const TableIndices<3> &indices) const -{ - return TableBase<3, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<3, T>::operator()(const TableIndices<3> &indices) -{ - return TableBase<3, T>::operator()(indices); -} - - - template inline Table<4, T>::Table(const size_type size1, const size_type size2, @@ -3310,24 +3192,6 @@ Table<4, T>::operator()(const size_type i, -template -inline typename AlignedVector::const_reference -Table<4, T>::operator()(const TableIndices<4> &indices) const -{ - return TableBase<4, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<4, T>::operator()(const TableIndices<4> &indices) -{ - return TableBase<4, T>::operator()(indices); -} - - - template inline Table<5, T>::Table(const size_type size1, const size_type size2, @@ -3415,24 +3279,6 @@ Table<5, T>::operator()(const size_type i, -template -inline typename AlignedVector::const_reference -Table<5, T>::operator()(const TableIndices<5> &indices) const -{ - return TableBase<5, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<5, T>::operator()(const TableIndices<5> &indices) -{ - return TableBase<5, T>::operator()(indices); -} - - - template inline Table<6, T>::Table(const size_type size1, const size_type size2, @@ -3539,24 +3385,6 @@ Table<6, T>::operator()(const size_type i, -template -inline typename AlignedVector::const_reference -Table<6, T>::operator()(const TableIndices<6> &indices) const -{ - return TableBase<6, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<6, T>::operator()(const TableIndices<6> &indices) -{ - return TableBase<6, T>::operator()(indices); -} - - - template inline Table<7, T>::Table(const size_type size1, const size_type size2, @@ -3670,24 +3498,6 @@ Table<7, T>::operator()(const size_type i, } - -template -inline typename AlignedVector::const_reference -Table<7, T>::operator()(const TableIndices<7> &indices) const -{ - return TableBase<7, T>::operator()(indices); -} - - - -template -inline typename AlignedVector::reference -Table<7, T>::operator()(const TableIndices<7> &indices) -{ - return TableBase<7, T>::operator()(indices); -} - - #endif // DOXYGEN