From 00c7cc68819fbe7226cbdac22396d8b51c5203b1 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 25 Feb 2018 17:08:17 -0500 Subject: [PATCH] Add some more typedefs to TransposeTable. --- include/deal.II/base/table.h | 41 ++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index 1ae43e7b97..f4c8b05bae 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -1521,6 +1521,21 @@ public: */ typedef typename TableBase<2,T>::size_type size_type; + /** + * Typedef for the values in the table. + */ + typedef typename AlignedVector::value_type value_type; + + /** + * Typedef for the references in the table. + */ + typedef typename AlignedVector::reference reference; + + /** + * Typedef for the constant references in the table. + */ + typedef typename AlignedVector::const_reference const_reference; + /** * Default constructor. Set all dimensions to zero. */ @@ -1539,7 +1554,7 @@ public: */ void reinit (const size_type size1, const size_type size2, - const bool omit_default_initialization = false); + const bool omit_default_initialization = false); /** * Direct access to one element of the table by specifying all indices at @@ -1547,8 +1562,8 @@ public: * * This version of the function only allows read access. */ - typename AlignedVector::const_reference operator () (const size_type i, - const size_type j) const; + const_reference operator () (const size_type i, + const size_type j) const; /** * Direct access to one element of the table by specifying all indices at @@ -1556,8 +1571,8 @@ public: * * This version of the function allows read-write access. */ - typename AlignedVector::reference operator () (const size_type i, - const size_type j); + reference operator () (const size_type i, + const size_type j); /** * Number of rows. This function really makes only sense since we have a @@ -1582,8 +1597,8 @@ protected: * implementation of these table classes for 2d arrays, then called * vector2d. */ - typename AlignedVector::reference el (const size_type i, - const size_type j); + reference el (const size_type i, + const size_type j); /** * Return the value of the element (i,j) as a read-only reference. @@ -1599,8 +1614,8 @@ protected: * implementation of these table classes for 2d arrays, then called * vector2d. */ - typename AlignedVector::const_reference el (const size_type i, - const size_type j) const; + const_reference el (const size_type i, + const size_type j) const; }; @@ -2392,7 +2407,7 @@ TransposeTable::reinit (const size_type size1, template inline -typename AlignedVector::const_reference +typename TransposeTable::const_reference TransposeTable::operator () (const size_type i, const size_type j) const { @@ -2405,7 +2420,7 @@ TransposeTable::operator () (const size_type i, template inline -typename AlignedVector::reference +typename TransposeTable::reference TransposeTable::operator () (const size_type i, const size_type j) { @@ -2418,7 +2433,7 @@ TransposeTable::operator () (const size_type i, template inline -typename AlignedVector::const_reference +typename TransposeTable::const_reference TransposeTable::el (const size_type i, const size_type j) const { @@ -2429,7 +2444,7 @@ TransposeTable::el (const size_type i, template inline -typename AlignedVector::reference +typename TransposeTable::reference TransposeTable::el (const size_type i, const size_type j) { -- 2.39.5