Update of /cvsroot/monetdb/sql/src/storage
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26260/src/storage
Modified Files:
store_sequence.mx
Log Message:
Tyring to fix the code that triggers some of the 120
"conversion from <type1> to <type2>, possible loss of data"
warnings with the Microsoft compiler on Windows (cf.,
http://monetdb.cwi.nl/testing/projects/monetdb/Current/sql/.Mic.32.32.d.1-Windows5.1..2008.08.29_00-09-02/make.out.html
):
use the correct type: BATcount() (now) returns BUN, NOT int
(Check the effect tomorrow at
http://monetdb.cwi.nl/testing/projects/monetdb/Current/sql/.Mic.32.32.d.1-Windows5.1/make.out.html
and
http://monetdb.cwi.nl/testing/projects/monetdb/Current/sql/.Mic.64.64.d.1-Windows5.2/make.out.html
)
Most of the remaining warnings are due to the fact that
member "ival" of struct "symbdata" in src/server/sql_symbol.mx
is defined as "lng" but often used as / assigned to "int"
(without cast or overflow check).
I will try to find a proper solution for this together with
Niels and/or Sjoerd...
U store_sequence.mx
Index: store_sequence.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/store_sequence.mx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- store_sequence.mx 11 Jan 2008 10:52:14 -0000 1.2
+++ store_sequence.mx 31 Aug 2008 22:07:15 -0000 1.3
@@ -31,11 +31,11 @@
typedef struct seqbulk {
void *internal_seq;
sql_sequence *seq;
- int cnt;
+ BUN cnt;
int save;
} seqbulk;
-extern seqbulk *seqbulk_create(sql_sequence *seq, int cnt);
+extern seqbulk *seqbulk_create(sql_sequence *seq, BUN cnt);
extern int seqbulk_next_value(seqbulk *seq, lng *val);
extern void seqbulk_destroy(seqbulk *seq);
@@ -193,7 +193,7 @@
return 1;
}
-seqbulk *seqbulk_create(sql_sequence *seq, int cnt)
+seqbulk *seqbulk_create(sql_sequence *seq, BUN cnt)
{
seqbulk *sb = NEW(seqbulk);
store_sequence *s;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
