2
0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-19 14:52:17 +00:00

FIX incosistent change to new _temporary traits

[SVN r27301]
This commit is contained in:
Michael Stevens
2005-02-10 08:37:29 +00:00
parent 0f6ab1bc8e
commit 3b940153d0
3 changed files with 15 additions and 3 deletions

View File

@@ -1011,8 +1011,9 @@ namespace boost { namespace numeric { namespace ublas {
typename M::closure_type>::type matrix_closure_type;
typedef const self_type const_closure_type;
typedef self_type closure_type;
typedef typename M::vector_temporary_type vector_temporary_type;
typedef typename M::matrix_temporary_type matrix_temporary_type;
// Replaced by _temporary_traits to avoid type requirements on M
//typedef typename M::vector_temporary_type vector_temporary_type;
//typedef typename M::matrix_temporary_type matrix_temporary_type;
typedef typename storage_restrict_traits<typename M::storage_category,
packed_proxy_tag>::storage_category storage_category;
typedef typename M::orientation_category orientation_category;
@@ -1928,6 +1929,16 @@ namespace boost { namespace numeric { namespace ublas {
static const_value_type zero_;
};
// Specialization for temporary_traits
template <class M>
struct vector_temporary_traits< banded_adaptor<M> >
: vector_temporary_traits< M > {} ;
template <class M>
struct matrix_temporary_traits< banded_adaptor<M> >
: matrix_temporary_traits< M > {} ;
template<class M>
typename banded_adaptor<M>::matrix_type banded_adaptor<M>::nil_;
template<class M>

View File

@@ -1139,6 +1139,7 @@ namespace boost { namespace numeric { namespace ublas {
typename M::closure_type>::type matrix_closure_type;
typedef const self_type const_closure_type;
typedef self_type closure_type;
// Replaced by _temporary_traits to avoid type requirements on M
//typedef typename M::vector_temporary_type vector_temporary_type;
//typedef typename M::matrix_temporary_type matrix_temporary_type;
typedef typename storage_restrict_traits<typename M::storage_category,

View File

@@ -912,6 +912,7 @@ namespace boost { namespace numeric { namespace ublas {
typename M::closure_type>::type matrix_closure_type;
typedef const self_type const_closure_type;
typedef self_type closure_type;
// Replaced by _temporary_traits to avoid type requirements on M
//typedef typename M::vector_temporary_type vector_temporary_type;
//typedef typename M::matrix_temporary_type matrix_temporary_type;
typedef typename storage_restrict_traits<typename M::storage_category,
@@ -2089,7 +2090,6 @@ namespace boost { namespace numeric { namespace ublas {
struct matrix_temporary_traits< symmetric_adaptor<M, TRI> >
: matrix_temporary_traits< M > {} ;
}}}
#endif