From 5c8b6de0829e92cdc6984c7bbd8873b84cbebcc1 Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Sat, 9 Oct 2004 07:57:25 +0000 Subject: [PATCH] attempt workaround for cw-8.3 ::template syntax problem --- include/boost/numeric/ublas/config.hpp | 4 ++-- include/boost/numeric/ublas/matrix_assign.hpp | 2 +- include/boost/numeric/ublas/vector_assign.hpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/numeric/ublas/config.hpp b/include/boost/numeric/ublas/config.hpp index afeefbb0..07f47f9f 100644 --- a/include/boost/numeric/ublas/config.hpp +++ b/include/boost/numeric/ublas/config.hpp @@ -227,8 +227,8 @@ namespace std { #ifndef BOOST_UBLAS_TYPENAME #define BOOST_UBLAS_TYPENAME typename #endif -#ifndef BOOST_UBLAS_TEMPLATE template -#define BOOST_UBLAS_TEMPLATE +#ifndef BOOST_UBLAS_TEMPLATE +#define BOOST_UBLAS_TEMPLATE template #endif #ifndef BOOST_UBLAS_USING #define BOOST_UBLAS_USING using diff --git a/include/boost/numeric/ublas/matrix_assign.hpp b/include/boost/numeric/ublas/matrix_assign.hpp index d995391b..69d7844f 100644 --- a/include/boost/numeric/ublas/matrix_assign.hpp +++ b/include/boost/numeric/ublas/matrix_assign.hpp @@ -677,7 +677,7 @@ namespace boost { namespace numeric { namespace ublas { matrix cm (m.size1 (), m.size2 ()); #ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES indexing_matrix_assign (scalar_assign::reference, value_type> (), cm, m, row_major_tag ()); - indexing_matrix_assign (functor1_type:BOOST_UBLAS_TEMPLATE make_debug_functor::reference, value_type> (), cm, e, row_major_tag ()); + indexing_matrix_assign (functor1_type::BOOST_UBLAS_TEMPLATE make_debug_functor::reference, value_type> (), cm, e, row_major_tag ()); #else indexing_matrix_assign (scalar_assign (), cm, m, row_major_tag ()); indexing_matrix_assign (functor1_type (), cm, e, row_major_tag ()); diff --git a/include/boost/numeric/ublas/vector_assign.hpp b/include/boost/numeric/ublas/vector_assign.hpp index e69fa9dc..5d21d3d2 100644 --- a/include/boost/numeric/ublas/vector_assign.hpp +++ b/include/boost/numeric/ublas/vector_assign.hpp @@ -320,7 +320,7 @@ namespace boost { namespace numeric { namespace ublas { vector cv (v.size ()); #ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES indexing_vector_assign (scalar_assign::reference, value_type> (), cv, v); - indexing_vector_assign (functor_type::template make_debug_functor::reference, value_type> (), cv, e); + indexing_vector_assign (functor_type::BOOST_UBLAS_TEMPLATE make_debug_functor::reference, value_type> (), cv, e); #else indexing_vector_assign (scalar_assign (), cv, v); indexing_vector_assign (functor_type (), cv, e); @@ -380,7 +380,7 @@ namespace boost { namespace numeric { namespace ublas { vector cv (v.size ()); #ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES indexing_vector_assign (scalar_assign::reference, value_type> (), cv, v); - indexing_vector_assign (functor_type::template make_debug_functor::reference, value_type> (), cv, e); + indexing_vector_assign (functor_type::BOOST_UBLAS_TEMPLATE make_debug_functor::reference, value_type> (), cv, e); #else indexing_vector_assign (scalar_assign (), cv, v); indexing_vector_assign (functor_type (), cv, e); @@ -415,7 +415,7 @@ namespace boost { namespace numeric { namespace ublas { vector cv (v.size ()); #ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES indexing_vector_assign (scalar_assign::reference, value_type> (), cv, v); - indexing_vector_assign (functor_type::template make_debug_functor::reference, value_type> (), cv, e); + indexing_vector_assign (functor_type::BOOST_UBLAS_TEMPLATE make_debug_functor::reference, value_type> (), cv, e); #else indexing_vector_assign (scalar_assign (), cv, v); indexing_vector_assign (functor_type (), cv, e);