boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-15 13:32:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix cw-8.3 disable type checks to avoid debug functor syntax problem

Browse Source 
svn path=/trunk/boost/boost/numeric/ublas/; revision=25645
This commit is contained in:
Michael Stevens
2004-10-10 08:21:57 +00:00
parent 0b60627364
commit e71122f865
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/numeric/ublas/config.hpp
View File

@@ -215,8 +215,8 @@ namespace std {
#define BOOST_UBLAS_USE_STREAM
// Base traits templates syntax untested
#define BOOST_UBLAS_NO_ITERATOR_BASE_TRAITS
// Problems with ::template resolution syntax
#define BOOST_UBLAS_TEMPLATE
// Problems type check debug functor syntax
#define BOOST_UBLAS_TYPE_CHECK 0
#endif
#endif
@@ -227,9 +227,6 @@ namespace std {
#ifndef BOOST_UBLAS_TYPENAME
#define BOOST_UBLAS_TYPENAME typename
#endif
#ifndef BOOST_UBLAS_TEMPLATE
#define BOOST_UBLAS_TEMPLATE template
#endif
#ifndef BOOST_UBLAS_USING
#define BOOST_UBLAS_USING using
#endif

2
include/boost/numeric/ublas/definitions.hpp
View File

@@ -165,7 +165,7 @@ namespace boost { namespace numeric { namespace ublas {
typename I::container_type::size_type
index (const I& i) {
typedef typename I::container_type container_type;
return dimension_properties<dimension>::BOOST_UBLAS_TEMPLATE index<container_type> (i);
return dimension_properties<dimension>::template index<container_type> (i);
}
#endif

8
include/boost/numeric/ublas/matrix_assign.hpp
View File

@@ -677,7 +677,7 @@ namespace boost { namespace numeric { namespace ublas {
matrix<value_type, row_major> cm (m.size1 (), m.size2 ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_matrix_assign (scalar_assign<typename matrix<value_type, row_major>::reference, value_type> (), cm, m, row_major_tag ());
indexing_matrix_assign (functor1_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename matrix<value_type, row_major>::reference, value_type> (), cm, e, row_major_tag ());
indexing_matrix_assign (functor1_type::template make_debug_functor<typename matrix<value_type, row_major>::reference, value_type> (), cm, e, row_major_tag ());
#else
indexing_matrix_assign (scalar_assign<value_type&, value_type> (), cm, m, row_major_tag ());
indexing_matrix_assign (functor1_type (), cm, e, row_major_tag ());
@@ -812,7 +812,7 @@ namespace boost { namespace numeric { namespace ublas {
matrix<value_type, column_major> cm (m.size1 (), m.size2 ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_matrix_assign (scalar_assign<typename matrix<value_type, column_major>::reference, value_type> (), cm, m, column_major_tag ());
indexing_matrix_assign (functor1_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename matrix<value_type, column_major>::reference, value_type> (), cm, e, column_major_tag ());
indexing_matrix_assign (functor1_type::template make_debug_functor<typename matrix<value_type, column_major>::reference, value_type> (), cm, e, column_major_tag ());
#else
indexing_matrix_assign (scalar_assign<value_type&, value_type> (), cm, m, column_major_tag ());
indexing_matrix_assign (functor1_type (), cm, e, column_major_tag ());
@@ -1010,7 +1010,7 @@ namespace boost { namespace numeric { namespace ublas {
matrix<value_type, row_major> cm (m.size1 (), m.size2 ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_matrix_assign (scalar_assign<typename matrix<value_type, row_major>::reference, value_type> (), cm, m, row_major_tag ());
indexing_matrix_assign (functor1_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename matrix<value_type, row_major>::reference, value_type> (), cm, e, row_major_tag ());
indexing_matrix_assign (functor1_type::template make_debug_functor<typename matrix<value_type, row_major>::reference, value_type> (), cm, e, row_major_tag ());
#else
indexing_matrix_assign (scalar_assign<value_type&, value_type> (), cm, m, row_major_tag ());
indexing_matrix_assign (functor1_type (), cm, e, row_major_tag ());
@@ -1137,7 +1137,7 @@ namespace boost { namespace numeric { namespace ublas {
matrix<value_type, column_major> cm (m.size1 (), m.size2 ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_matrix_assign (scalar_assign<typename matrix<value_type, column_major>::reference, value_type> (), cm, m, column_major_tag ());
indexing_matrix_assign (functor1_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename matrix<value_type, column_major>::reference, value_type> (), cm, e, column_major_tag ());
indexing_matrix_assign (functor1_type::template make_debug_functor<typename matrix<value_type, column_major>::reference, value_type> (), cm, e, column_major_tag ());
#else
indexing_matrix_assign (scalar_assign<value_type&, value_type> (), cm, m, column_major_tag ());
indexing_matrix_assign (functor1_type (), cm, e, column_major_tag ());

6
include/boost/numeric/ublas/vector_assign.hpp
View File

@@ -320,7 +320,7 @@ namespace boost { namespace numeric { namespace ublas {
vector<value_type> cv (v.size ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_vector_assign (scalar_assign<typename vector<value_type>::reference, value_type> (), cv, v);
indexing_vector_assign (functor_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename vector<value_type>::reference, value_type> (), cv, e);
indexing_vector_assign (functor_type::template make_debug_functor<typename vector<value_type>::reference, value_type> (), cv, e);
#else
indexing_vector_assign (scalar_assign<value_type&, value_type> (), cv, v);
indexing_vector_assign (functor_type (), cv, e);
@@ -380,7 +380,7 @@ namespace boost { namespace numeric { namespace ublas {
vector<value_type> cv (v.size ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_vector_assign (scalar_assign<typename vector<value_type>::reference, value_type> (), cv, v);
indexing_vector_assign (functor_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename vector<value_type>::reference, value_type> (), cv, e);
indexing_vector_assign (functor_type::template make_debug_functor<typename vector<value_type>::reference, value_type> (), cv, e);
#else
indexing_vector_assign (scalar_assign<value_type&, value_type> (), cv, v);
indexing_vector_assign (functor_type (), cv, e);
@@ -415,7 +415,7 @@ namespace boost { namespace numeric { namespace ublas {
vector<value_type> cv (v.size ());
#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
indexing_vector_assign (scalar_assign<typename vector<value_type>::reference, value_type> (), cv, v);
indexing_vector_assign (functor_type::BOOST_UBLAS_TEMPLATE make_debug_functor<typename vector<value_type>::reference, value_type> (), cv, e);
indexing_vector_assign (functor_type::template make_debug_functor<typename vector<value_type>::reference, value_type> (), cv, e);
#else
indexing_vector_assign (scalar_assign<value_type&, value_type> (), cv, v);
indexing_vector_assign (functor_type (), cv, e);