[Toon-members] TooN/internal operators.hh

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/08/27 16:40:14

Modified files:
        internal       : operators.hh 

Log message:
        Undoing more over-zealousness.

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

Patches:
Index: operators.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/operators.hh,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- operators.hh        27 Jul 2009 16:39:43 -0000      1.43
+++ operators.hh        27 Aug 2009 16:40:13 -0000      1.44
@@ -62,10 +62,15 @@
        template<class L, class R, int F = Field<L,R>::is> struct MultiplyType 
{ typedef TOON_TYPEOF(gettype<L>()*gettype<R>()) type;};
        template<class L, class R, int F = Field<L,R>::is> struct DivideType   
{ typedef TOON_TYPEOF(gettype<L>()/gettype<R>()) type;};
        
-       template<class L, class R> struct AddType<L, R, 0>         { typedef 
void type;};
-       template<class L, class R> struct SubtractType<L, R, 0>    { typedef 
void type;};
-       template<class L, class R> struct MultiplyType<L, R, 0>    { typedef 
void type;};
-       template<class L, class R> struct DivideType<L, R, 0>      { typedef 
void type;};
+       template<class L, class R> struct unable_to_add_numbers;
+       template<class L, class R> struct unable_to_multiply_numbers;
+       template<class L, class R> struct unable_to_subtract_numbers;
+       template<class L, class R> struct unable_to_divide_numbers;
+       
+       template<class L, class R> struct AddType<L, R, 0>         { typedef 
unable_to_add_numbers<L,R> type;};
+       template<class L, class R> struct SubtractType<L, R, 0>    { typedef 
unable_to_subtract_numbers<L,R> type;};
+       template<class L, class R> struct MultiplyType<L, R, 0>    { typedef 
unable_to_multiply_numbers<L,R> type;};
+       template<class L, class R> struct DivideType<L, R, 0>      { typedef 
unable_to_divide_numbers<L,R> type;};
 
 
        //Mini operators for passing to Pairwise, etc