From 7bb61ba86f687c6015a7b83dc31fff460ac2c14b Mon Sep 17 00:00:00 2001
From: Michael Stevens <mail@michael-stevens.de>
Date: Tue, 31 Aug 2004 08:44:29 +0000
Subject: [PATCH] Made returned index_array_type etc public. Thanks to Karl for
 spotting this.

svn path=/trunk/boost/boost/numeric/ublas/; revision=24836
---
 include/boost/numeric/ublas/matrix_sparse.hpp | 9 ++++-----
 include/boost/numeric/ublas/vector_sparse.hpp | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/boost/numeric/ublas/matrix_sparse.hpp b/include/boost/numeric/ublas/matrix_sparse.hpp
index e59da1ba..8a4e1622 100644
--- a/include/boost/numeric/ublas/matrix_sparse.hpp
+++ b/include/boost/numeric/ublas/matrix_sparse.hpp
@@ -259,10 +259,9 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         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 sparse_matrix<T, F, A> const_self_type;
         typedef sparse_matrix<T, F, A> self_type;
     public:
@@ -313,7 +312,7 @@ namespace boost { namespace numeric { namespace ublas {
             return data_.size ();
         }
         BOOST_UBLAS_INLINE
-        const_array_type &data () const {
+        const array_type &data () const {
             return data_;
         }
         BOOST_UBLAS_INLINE
@@ -2531,9 +2530,9 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         typedef const T *const_pointer;
         typedef T *pointer;
-    private:
         typedef IA index_array_type;
         typedef TA value_array_type;
+    private:
         typedef F functor_type;
         typedef const compressed_matrix<T, F, IB, IA, TA> const_self_type;
         typedef compressed_matrix<T, F, IB, IA, TA> self_type;
@@ -3871,9 +3870,9 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         typedef const T *const_pointer;
         typedef T *pointer;
-    private:
         typedef IA index_array_type;
         typedef TA value_array_type;
+    private:
         typedef F functor_type;
         typedef const coordinate_matrix<T, F, IB, IA, TA> const_self_type;
         typedef coordinate_matrix<T, F, IB, IA, TA> self_type;
diff --git a/include/boost/numeric/ublas/vector_sparse.hpp b/include/boost/numeric/ublas/vector_sparse.hpp
index 2b7d76ed..8fb578ba 100644
--- a/include/boost/numeric/ublas/vector_sparse.hpp
+++ b/include/boost/numeric/ublas/vector_sparse.hpp
@@ -255,9 +255,8 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         typedef const T *const_pointer;
         typedef T *pointer;
-    private:
         typedef A array_type;
-        typedef const A const_array_type;
+    private:
         typedef const sparse_vector<T, A> const_self_type;
         typedef sparse_vector<T, A> self_type;
     public:
@@ -303,7 +302,7 @@ namespace boost { namespace numeric { namespace ublas {
             return data_.size ();
         }
         BOOST_UBLAS_INLINE
-        const_array_type &data () const {
+        const array_type &data () const {
             return data_;
         }
         BOOST_UBLAS_INLINE
@@ -747,9 +746,9 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         typedef const T *const_pointer;
         typedef T *pointer;
-    private:
         typedef IA index_array_type;
         typedef TA value_array_type;
+    private:
         typedef const compressed_vector<T, IB, IA, TA> const_self_type;
         typedef compressed_vector<T, IB, IA, TA> self_type;
     public:
@@ -1314,9 +1313,9 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         typedef const T *const_pointer;
         typedef T *pointer;
-    private:
         typedef IA index_array_type;
         typedef TA value_array_type;
+    private:
         typedef const coordinate_vector<T, IB, IA, TA> const_self_type;
         typedef coordinate_vector<T, IB, IA, TA> self_type;
     public: