[Toon-members] TooN/internal operators.hh

[Tom Drummond]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Tom Drummond <twd20>    09/03/09 12:00:08

Modified files:
        internal       : operators.hh 

Log message:
        further cleaning

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/operators.hh?cvsroot=toon&r1=1.11&r2=1.12

Patches:
Index: operators.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/operators.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- operators.hh        9 Mar 2009 11:55:25 -0000       1.11
+++ operators.hh        9 Mar 2009 12:00:06 -0000       1.12
@@ -190,11 +190,9 @@
 template<int R1, int C1, int R2, int C2, typename P1, typename P2, typename 
B1, typename B2> 
 Matrix<R1, C2, typename Internal::MultiplyType<P1, P2>::type> operator*(const 
Matrix<R1, C1, P1, B1>& m1, const Matrix<R2, C2, P2, B2>& m2)
 {
-       typedef typename Internal::MultiplyType<P1, P2>::type restype;
-
        SizeMismatch<R1, C2>:: test(m1.num_rows(),m2.num_cols());
        SizeMismatch<C1, R2>:: test(m1.num_cols(),m2.num_rows());
-       return Matrix<Internal::Sizer<R1,R1>::size, 
Internal::Sizer<C2,C2>::size,restype>(m1, m2, 
Operator<Internal::MatrixMultiply>(), m1.num_rows(), m2.num_cols());
+       return Matrix<R1, C2, typename Internal::MultiplyType<P1, 
P2>::type>(m1, m2, Operator<Internal::MatrixMultiply>(), m1.num_rows(), 
m2.num_cols());
 }
 
 // Matrix Vector multiplication Matrix * Vector