From efe7eecbc1f05dd31df521c4e3e892be4247ffa9 Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Mon, 20 Sep 2004 07:36:06 +0000 Subject: [PATCH] use array size_type svn path=/trunk/boost/boost/numeric/ublas/; revision=25252 --- include/boost/numeric/ublas/banded.hpp | 6 +++--- include/boost/numeric/ublas/hermitian.hpp | 8 ++++---- include/boost/numeric/ublas/symmetric.hpp | 4 ++-- include/boost/numeric/ublas/triangular.hpp | 4 ++-- include/boost/numeric/ublas/vector_of_vector.hpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/boost/numeric/ublas/banded.hpp b/include/boost/numeric/ublas/banded.hpp index def348fd..33746294 100644 --- a/include/boost/numeric/ublas/banded.hpp +++ b/include/boost/numeric/ublas/banded.hpp @@ -33,8 +33,8 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef typename A::size_type size_type; + typedef typename A::difference_type difference_type; typedef T value_type; typedef const T &const_reference; typedef T &reference; @@ -1014,7 +1014,7 @@ namespace boost { namespace numeric { namespace ublas { class diagonal_matrix: public banded_matrix { public: - typedef std::size_t size_type; + typedef typename A::size_type size_type; typedef banded_matrix matrix_type; // Construction and destruction diff --git a/include/boost/numeric/ublas/hermitian.hpp b/include/boost/numeric/ublas/hermitian.hpp index 8359121e..bd43604a 100644 --- a/include/boost/numeric/ublas/hermitian.hpp +++ b/include/boost/numeric/ublas/hermitian.hpp @@ -163,8 +163,8 @@ namespace boost { namespace numeric { namespace ublas { typedef typename type_traits::real_type real_type; typedef typename type_traits::precision_type precision_type; - BOOST_STATIC_CONSTANT (std::size_t, plus_complexity = type_traits::plus_complexity); - BOOST_STATIC_CONSTANT (std::size_t, multiplies_complexity = type_traits::multiplies_complexity); + BOOST_STATIC_CONSTANT (unsigned, plus_complexity = type_traits::plus_complexity); + BOOST_STATIC_CONSTANT (unsigned, multiplies_complexity = type_traits::multiplies_complexity); static BOOST_UBLAS_INLINE @@ -240,8 +240,8 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef typename A::size_type size_type; + typedef typename A::difference_type difference_type; typedef T value_type; // FIXME: no better way to not return the address of a temporary? // typedef const T &const_reference; diff --git a/include/boost/numeric/ublas/symmetric.hpp b/include/boost/numeric/ublas/symmetric.hpp index 7c073b66..f8ba6b67 100644 --- a/include/boost/numeric/ublas/symmetric.hpp +++ b/include/boost/numeric/ublas/symmetric.hpp @@ -50,8 +50,8 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef typename A::size_type size_type; + typedef typename A::difference_type difference_type; typedef T value_type; typedef const T &const_reference; typedef T &reference; diff --git a/include/boost/numeric/ublas/triangular.hpp b/include/boost/numeric/ublas/triangular.hpp index db830d36..ddb0b9ff 100644 --- a/include/boost/numeric/ublas/triangular.hpp +++ b/include/boost/numeric/ublas/triangular.hpp @@ -33,8 +33,8 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef typename A::size_type size_type; + typedef typename A::difference_type difference_type; typedef T value_type; typedef const T &const_reference; typedef T &reference; diff --git a/include/boost/numeric/ublas/vector_of_vector.hpp b/include/boost/numeric/ublas/vector_of_vector.hpp index 66650210..48d4c656 100644 --- a/include/boost/numeric/ublas/vector_of_vector.hpp +++ b/include/boost/numeric/ublas/vector_of_vector.hpp @@ -36,8 +36,8 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef typename A::size_type size_type; + typedef typename A::difference_type difference_type; typedef T value_type; typedef const T &const_reference; #ifndef BOOST_UBLAS_STRICT_VECTOR_SPARSE