Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26946
Modified Files:
sql.mx
Log Message:
The conversion routines behave differently when compiled in
optimized mode and on different platforms. The changes here
are meant to drive the compiler to perform a better type
coercion. [let's see what it brings]
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- sql.mx 23 May 2007 22:05:57 -0000 1.226
+++ sql.mx 27 May 2007 18:27:38 -0000 1.227
@@ -1960,9 +1960,9 @@
str @[EMAIL PROTECTED]( @1 *res, int *s1, @2 *v )
{
- int scale = *s1;
- lng vdummy= *v;
- @1 r, h = (vdummy <0)?-5:5;
+ int scale = (int) *s1;
+ lng vdummy= (lng) *v;
+ @1 r, h = (vdummy <0)?(@1) -5: (@1) 5;
/* shortcut nil */
if (*v == @2_nil) {
@@ -1981,11 +1981,11 @@
str @[EMAIL PROTECTED]( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
{
- int p = *d2, inlen = 1;
- @2 cpyval = *v;
+ int p = (int) *d2, inlen = 1;
+ @2 cpyval = (@2) *v;
int s1 = *S1, s2 = *S2;
- lng vdummy= *v;
- @1 r, h = ( vdummy<0)?-5:5;
+ lng vdummy= (lng) *v;
+ @1 r, h = ( vdummy<0)? (@1) -5: (@1) 5;
/* shortcut nil */
if (*v == @2_nil) {
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
