From d4ea481168c5510093adf5d736402eb352a45111 Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Mon, 20 Sep 2004 07:33:10 +0000 Subject: [PATCH] unsigned complexity FIXME comments --- include/boost/numeric/ublas/matrix_expression.hpp | 11 ++++++----- include/boost/numeric/ublas/vector_expression.hpp | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/boost/numeric/ublas/matrix_expression.hpp b/include/boost/numeric/ublas/matrix_expression.hpp index 4f76ff63..2f19c544 100644 --- a/include/boost/numeric/ublas/matrix_expression.hpp +++ b/include/boost/numeric/ublas/matrix_expression.hpp @@ -28,11 +28,12 @@ namespace boost { namespace numeric { namespace ublas { template struct matrix_expression: private nonassignable { - BOOST_STATIC_CONSTANT (int, complexity = 0); + //FIXME public expression_base { + BOOST_STATIC_CONSTANT (unsigned, complexity = 0); typedef E expression_type; typedef matrix_tag type_category; typedef abstract_tag simd_category; - // FIXME: Why doesn't this work? + // FIXME: Template instantiation order problem // typedef typename E::size_type size_type; typedef std::size_t size_type; typedef noalias_proxy noalias_proxy_type; @@ -3636,7 +3637,7 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING vector_expression >::operator (); #endif - BOOST_STATIC_CONSTANT (int, complexity = 1); + BOOST_STATIC_CONSTANT (unsigned, complexity = 1); typedef typename promote_traits::promote_type size_type; typedef typename promote_traits::promote_type difference_type; typedef typename F::result_type value_type; @@ -4040,7 +4041,7 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING vector_expression >::operator (); #endif - BOOST_STATIC_CONSTANT (int, complexity = 1); + BOOST_STATIC_CONSTANT (unsigned, complexity = 1); typedef typename promote_traits::promote_type size_type; typedef typename promote_traits::promote_type difference_type; typedef typename F::result_type value_type; @@ -4444,7 +4445,7 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - BOOST_STATIC_CONSTANT (int, complexity = 1); + BOOST_STATIC_CONSTANT (unsigned, complexity = 1); typedef typename promote_traits::promote_type size_type; typedef typename promote_traits::promote_type difference_type; typedef typename F::result_type value_type; diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp index 733f0a54..4b455283 100644 --- a/include/boost/numeric/ublas/vector_expression.hpp +++ b/include/boost/numeric/ublas/vector_expression.hpp @@ -110,9 +110,9 @@ namespace boost { namespace numeric { namespace ublas { template class vector_expression: private nonassignable { -//FIXME public expression_base { + //FIXME public expression_base { public: - BOOST_STATIC_CONSTANT (int, complexity = 0); + BOOST_STATIC_CONSTANT (unsigned, complexity = 0); typedef E expression_type; typedef vector_tag type_category; typedef abstract_tag simd_category; @@ -1780,7 +1780,7 @@ namespace boost { namespace numeric { namespace ublas { class vector_scalar_binary: public scalar_expression { public: - BOOST_STATIC_CONSTANT (int, complexity = 1); + BOOST_STATIC_CONSTANT (unsigned, complexity = 1); typedef typename F::size_type size_type; typedef typename F::difference_type difference_type; typedef typename F::result_type value_type;