[Toon-members] TooN/internal operators.hh vector.hh

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/03/06 12:35:25

Modified files:
        internal       : operators.hh vector.hh 

Log message:
        Uncomment the scalar operators. All test programs that should compile
        now compile.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/operators.hh?cvsroot=toon&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/vector.hh?cvsroot=toon&r1=1.19&r2=1.20

Patches:
Index: operators.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/operators.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- operators.hh        18 Feb 2009 20:02:39 -0000      1.8
+++ operators.hh        6 Mar 2009 12:35:25 -0000       1.9
@@ -207,10 +207,10 @@
        return Matrix<R, C,restype>(s, m, 
Operator<Internal::ApplyScalarLeft<restype, Internal::OPNAME> >(), 
m.num_rows(), m.num_cols());\
 }
 
-//TOON_MAKE_SCALAR_OP_PAIR(Add, +)
-//TOON_MAKE_SCALAR_OP_PAIR(Subtract, -)
-//TOON_MAKE_SCALAR_OP_PAIR(Multiply, *)
-//TOON_MAKE_SCALAR_OP_PAIR(Divide, /)
+TOON_MAKE_SCALAR_OP_PAIR(Add, +)
+TOON_MAKE_SCALAR_OP_PAIR(Subtract, -)
+TOON_MAKE_SCALAR_OP_PAIR(Multiply, *)
+TOON_MAKE_SCALAR_OP_PAIR(Divide, /)
 
 #undef TOON_MAKE_SCALAR_OP_PAIR
 

Index: vector.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/vector.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- vector.hh   6 Mar 2009 12:25:24 -0000       1.19
+++ vector.hh   6 Mar 2009 12:35:25 -0000       1.20
@@ -66,27 +66,27 @@
 
 
        Vector& operator+=(const Precision& rhs) {
-               for(int i=0; i<Base::size(); i++)
+               for(int i=0; i<size(); i++)
                        (*this)[i]+=rhs;
                return *this;
        }
        
 
        Vector& operator-=(const Precision& rhs) {
-               for(int i=0; i<Base::size(); i++)
+               for(int i=0; i<size(); i++)
                        (*this)[i]-=rhs;
                return *this;
        }
        
        Vector& operator/=(const Precision& rhs) {
-               for(int i=0; i<Base::size(); i++)
+               for(int i=0; i<size(); i++)
                        (*this)[i]/=rhs;
                return *this;
        }
        
 
        Vector& operator*=(const Precision& rhs) {
-               for(int i=0; i<Base::size(); i++)
+               for(int i=0; i<size(); i++)
                        (*this)[i]*=rhs;
                return *this;
        }