From 155fa753a0fdfa3ea43036bcd507c45906114c12 Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Wed, 1 Sep 2004 13:21:24 +0000 Subject: [PATCH] propogated array_type is public change [SVN r24847] --- include/boost/numeric/ublas/matrix.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/include/boost/numeric/ublas/matrix.hpp b/include/boost/numeric/ublas/matrix.hpp index 10bbe5c3..28db4c81 100644 --- a/include/boost/numeric/ublas/matrix.hpp +++ b/include/boost/numeric/ublas/matrix.hpp @@ -43,10 +43,9 @@ namespace boost { namespace numeric { namespace ublas { typedef T &reference; typedef const T *const_pointer; typedef T *pointer; + typedef A array_type; private: typedef F functor_type; - typedef A array_type; - typedef const A const_array_type; typedef const matrix const_self_type; typedef matrix self_type; public: @@ -99,7 +98,7 @@ namespace boost { namespace numeric { namespace ublas { return size2_; } BOOST_UBLAS_INLINE - const_array_type &data () const { + const array_type &data () const { return data_; } BOOST_UBLAS_INLINE @@ -1002,10 +1001,9 @@ namespace boost { namespace numeric { namespace ublas { typedef T &reference; typedef const T *const_pointer; typedef T *pointer; + typedef A array_type; private: typedef F functor_type; - typedef A array_type; - typedef const A const_array_type; typedef const vector_of_vector const_self_type; typedef vector_of_vector self_type; public: @@ -1057,7 +1055,7 @@ namespace boost { namespace numeric { namespace ublas { return size2_; } BOOST_UBLAS_INLINE - const_array_type &data () const { + const array_type &data () const { return data_; } BOOST_UBLAS_INLINE