Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7889
Modified Files:
calc.mx
Log Message:
Fix warning: conversion from 'int' to 'flt', possible loss of data
Also put parentheses in correct places in macros.
Index: calc.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/calc.mx,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- calc.mx 11 Jan 2008 10:41:35 -0000 1.69
+++ calc.mx 16 Jan 2008 11:27:35 -0000 1.70
@@ -566,10 +566,10 @@
/* the normal implementation of an operator is to just stick the
operator between the operands */
-#define calc_abs(s) ((s)>0)?(s):-(s)
+#define calc_abs(s) ((s) > 0 ? (s) : -(s))
#define calc_inv(s) (1/(s))
#define calc_neg(s) (-(s))
-#define calc_sign(s) ((s)<0)?-1:((s)==0)?0:1
+#define calc_sign(s) ((s) < 0 ? -1 : (s) == 0 ? 0 : 1)
@= calc_length
calc_export str [EMAIL PROTECTED](int *res , @1 *a );
@@ -1053,7 +1053,7 @@
if (*a == @3_nil) {
*res = @3_nil;
} else {
- *res = @2 (*a);
+ *res = (@3) (@2 (*a));
}
return(MAL_SUCCEED);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
