MonetDB: mosaic - Fix testweb compilation issue's.

[Aris Koning]

Changeset: c473ef43a472 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c473ef43a472
Modified Files:
        monetdb5/modules/mosaic/mosaic.h
        monetdb5/modules/mosaic/mosaic_prefix.c
Branch: mosaic
Log Message:

Fix testweb compilation issue's.


diffs (31 lines):

diff --git a/monetdb5/modules/mosaic/mosaic.h b/monetdb5/modules/mosaic/mosaic.h
--- a/monetdb5/modules/mosaic/mosaic.h
+++ b/monetdb5/modules/mosaic/mosaic.h
@@ -79,11 +79,11 @@ typedef struct MOSAICHEADER{
        lng blks[MOSAIC_METHODS]; // number of blks per method.
        lng elms[MOSAIC_METHODS]; // number of compressed values in all blocks 
for this method.
        bte bits_var;
-       ulng pos_var;
-       ulng length_var;
+       BUN pos_var;
+       BUN length_var;
        bte bits_capped;
-       ulng pos_capped;
-       ulng length_capped;
+       BUN pos_capped;
+       BUN length_capped;
 } * MosaicHdr;
 
 
diff --git a/monetdb5/modules/mosaic/mosaic_prefix.c 
b/monetdb5/modules/mosaic/mosaic_prefix.c
--- a/monetdb5/modules/mosaic/mosaic_prefix.c
+++ b/monetdb5/modules/mosaic/mosaic_prefix.c
@@ -214,7 +214,7 @@ do {\
                assert( (prefix | (getSuffixMask(suffix_bits, TPE) & (*val))) 
== *val);\
        }\
 \
-       (PARAMETERS).base.cnt = i;\
+       (PARAMETERS).base.cnt = (unsigned int) i;\
        (PARAMETERS).suffix_bits = suffix_bits;\
        (PARAMETERS).prefix.prefix##TPE = prefix;\
 } while(0)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list