From b3a38ee3cc82014c92cab84bedbaec9680dee2dc Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Wed, 14 Jul 2004 15:13:33 +0000 Subject: [PATCH] typename svn path=/trunk/boost/boost/numeric/ublas/; revision=23545 --- include/boost/numeric/ublas/operation.hpp | 20 +++++++++---------- .../boost/numeric/ublas/operation_blocked.hpp | 8 ++++---- .../boost/numeric/ublas/operation_sparse.hpp | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/boost/numeric/ublas/operation.hpp b/include/boost/numeric/ublas/operation.hpp index ced4bced..899a26f2 100644 --- a/include/boost/numeric/ublas/operation.hpp +++ b/include/boost/numeric/ublas/operation.hpp @@ -78,7 +78,7 @@ namespace boost { namespace numeric { namespace ublas { v.assign (zero_vector (e1.size1 ())); #if BOOST_UBLAS_TYPE_CHECK vector cv (v); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type verrorbound (norm_1 (v) + norm_1 (e1) * norm_1 (e2)); indexing_vector_assign (scalar_plus_assign::reference, value_type> (), cv, prod (e1, e2)); #endif @@ -230,7 +230,7 @@ namespace boost { namespace numeric { namespace ublas { v.assign (zero_vector (e1 ().size1 ())); #if BOOST_UBLAS_TYPE_CHECK vector cv (v); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type verrorbound (norm_1 (v) + norm_1 (e1) * norm_1 (e2)); indexing_vector_assign (scalar_plus_assign::reference, value_type> (), cv, prod (e1, e2)); #endif @@ -304,7 +304,7 @@ namespace boost { namespace numeric { namespace ublas { v.assign (zero_vector (e2 ().size2 ())); #if BOOST_UBLAS_TYPE_CHECK vector cv (v); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type verrorbound (norm_1 (v) + norm_1 (e1) * norm_1 (e2)); indexing_vector_assign (scalar_plus_assign::reference, value_type> (), cv, prod (e1, e2)); #endif @@ -456,7 +456,7 @@ namespace boost { namespace numeric { namespace ublas { v.assign (zero_vector (e2 ().size2 ())); #if BOOST_UBLAS_TYPE_CHECK vector cv (v); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type verrorbound (norm_1 (v) + norm_1 (e1) * norm_1 (e2)); indexing_vector_assign (scalar_plus_assign::reference, value_type> (), cv, prod (e1, e2)); #endif @@ -494,7 +494,7 @@ namespace boost { namespace numeric { namespace ublas { #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), row_major_tag ()); #endif @@ -524,7 +524,7 @@ namespace boost { namespace numeric { namespace ublas { #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), row_major_tag ()); #endif @@ -573,7 +573,7 @@ namespace boost { namespace numeric { namespace ublas { #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), column_major_tag ()); #endif @@ -603,7 +603,7 @@ namespace boost { namespace numeric { namespace ublas { #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), column_major_tag ()); #endif @@ -734,7 +734,7 @@ namespace boost { namespace numeric { namespace ublas { #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), row_major_tag ()); #endif @@ -765,7 +765,7 @@ namespace boost { namespace numeric { namespace ublas { #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), column_major_tag ()); #endif diff --git a/include/boost/numeric/ublas/operation_blocked.hpp b/include/boost/numeric/ublas/operation_blocked.hpp index 8c0a1074..8698fea9 100644 --- a/include/boost/numeric/ublas/operation_blocked.hpp +++ b/include/boost/numeric/ublas/operation_blocked.hpp @@ -34,7 +34,7 @@ namespace boost { namespace numeric { namespace ublas { V v (e1 ().size1 ()); #if BOOST_UBLAS_TYPE_CHECK vector cv (v.size ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type verrorbound (norm_1 (v) + norm_1 (e1) * norm_1 (e2)); indexing_vector_assign (scalar_assign::reference, value_type> (), cv, prod (e1, e2)); #endif @@ -89,7 +89,7 @@ namespace boost { namespace numeric { namespace ublas { V v (e2 ().size2 ()); #if BOOST_UBLAS_TYPE_CHECK vector cv (v.size ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type verrorbound (norm_1 (v) + norm_1 (e1) * norm_1 (e2)); indexing_vector_assign (scalar_assign::reference, value_type> (), cv, prod (e1, e2)); #endif @@ -144,7 +144,7 @@ namespace boost { namespace numeric { namespace ublas { M m (e1 ().size1 (), e2 ().size2 ()); #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), row_major_tag ()); disable_type_check::value = true; @@ -205,7 +205,7 @@ namespace boost { namespace numeric { namespace ublas { M m (e1 ().size1 (), e2 ().size2 ()); #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), column_major_tag ()); disable_type_check::value = true; diff --git a/include/boost/numeric/ublas/operation_sparse.hpp b/include/boost/numeric/ublas/operation_sparse.hpp index a02a1d07..58d9e293 100644 --- a/include/boost/numeric/ublas/operation_sparse.hpp +++ b/include/boost/numeric/ublas/operation_sparse.hpp @@ -38,7 +38,7 @@ namespace boost { namespace numeric { namespace ublas { vector temporary (e2 ().size2 ()); #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), row_major_tag ()); #endif @@ -103,7 +103,7 @@ namespace boost { namespace numeric { namespace ublas { vector temporary (e1 ().size1 ()); #if BOOST_UBLAS_TYPE_CHECK matrix cm (m.size1 (), m.size2 ()); - typedef type_traits::real_type real_type; + typedef typename type_traits::real_type real_type; real_type merrorbound (norm_1 (m) + norm_1 (e1) * norm_1 (e2)); indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, prod (e1, e2), column_major_tag ()); #endif