Boost logo

Boost-Commit :

From: guwi17_at_[hidden]
Date: 2007-12-06 14:21:31


Author: guwi17
Date: 2007-12-06 14:21:31 EST (Thu, 06 Dec 2007)
New Revision: 41801
URL: http://svn.boost.org/trac/boost/changeset/41801

Log:
- fix and close #1502
- the return types were not correct: there was A instead of indirect_array<A>

Text files modified:
   trunk/boost/numeric/ublas/expression_types.hpp | 32 ++++++++++++++++----------------
   1 files changed, 16 insertions(+), 16 deletions(-)

Modified: trunk/boost/numeric/ublas/expression_types.hpp
==============================================================================
--- trunk/boost/numeric/ublas/expression_types.hpp (original)
+++ trunk/boost/numeric/ublas/expression_types.hpp 2007-12-06 14:21:31 EST (Thu, 06 Dec 2007)
@@ -217,13 +217,13 @@
         }
         template<class A>
         BOOST_UBLAS_INLINE
- const vector_indirect<const E, A> operator () (const indirect_array<A> &ia) const {
- return vector_indirect<const E, A> (operator () (), ia);
+ const vector_indirect<const E, indirect_array<A> > operator () (const indirect_array<A> &ia) const {
+ return vector_indirect<const E, indirect_array<A> > (operator () (), ia);
         }
         template<class A>
         BOOST_UBLAS_INLINE
- vector_indirect<E, A> operator () (const indirect_array<A> &ia) {
- return vector_indirect<E, A> (operator () (), ia);
+ vector_indirect<E, indirect_array<A> > operator () (const indirect_array<A> &ia) {
+ return vector_indirect<E, indirect_array<A> > (operator () (), ia);
         }
 
         BOOST_UBLAS_INLINE
@@ -244,13 +244,13 @@
         }
         template<class A>
         BOOST_UBLAS_INLINE
- const vector_indirect<const E, A> project (const indirect_array<A> &ia) const {
- return vector_indirect<const E, A> (operator () (), ia);
+ const vector_indirect<const E, indirect_array<A> > project (const indirect_array<A> &ia) const {
+ return vector_indirect<const E, indirect_array<A> > (operator () (), ia);
         }
         template<class A>
         BOOST_UBLAS_INLINE
- vector_indirect<E, A> project (const indirect_array<A> &ia) {
- return vector_indirect<E, A> (operator () (), ia);
+ vector_indirect<E, indirect_array<A> > project (const indirect_array<A> &ia) {
+ return vector_indirect<E, indirect_array<A> > (operator () (), ia);
         }
 #endif
     };
@@ -371,13 +371,13 @@
         }
         template<class A>
         BOOST_UBLAS_INLINE
- const matrix_indirect<const E, A> operator () (const indirect_array<A> &ia1, const indirect_array<A> &ia2) const {
- return matrix_indirect<const E, A> (operator () (), ia1, ia2);
+ const matrix_indirect<const E, indirect_array<A> > operator () (const indirect_array<A> &ia1, const indirect_array<A> &ia2) const {
+ return matrix_indirect<const E, indirect_array<A> > (operator () (), ia1, ia2);
         }
         template<class A>
         BOOST_UBLAS_INLINE
- matrix_indirect<E, A> operator () (const indirect_array<A> &ia1, const indirect_array<A> &ia2) {
- return matrix_indirect<E, A> (operator () (), ia1, ia2);
+ matrix_indirect<E, indirect_array<A> > operator () (const indirect_array<A> &ia1, const indirect_array<A> &ia2) {
+ return matrix_indirect<E, indirect_array<A> > (operator () (), ia1, ia2);
         }
 
         BOOST_UBLAS_INLINE
@@ -398,13 +398,13 @@
         }
         template<class A>
         BOOST_UBLAS_INLINE
- const matrix_indirect<const E, A> project (const indirect_array<A> &ia1, const indirect_array<A> &ia2) const {
- return matrix_indirect<const E, A> (operator () (), ia1, ia2);
+ const matrix_indirect<const E, indirect_array<A> > project (const indirect_array<A> &ia1, const indirect_array<A> &ia2) const {
+ return matrix_indirect<const E, indirect_array<A> > (operator () (), ia1, ia2);
         }
         template<class A>
         BOOST_UBLAS_INLINE
- matrix_indirect<E, A> project (const indirect_array<A> &ia1, const indirect_array<A> &ia2) {
- return matrix_indirect<E, A> (operator () (), ia1, ia2);
+ matrix_indirect<E, indirect_array<A> > project (const indirect_array<A> &ia1, const indirect_array<A> &ia2) {
+ return matrix_indirect<E, indirect_array<A> > (operator () (), ia1, ia2);
         }
 #endif
     };


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk