Changeset: f6ffa4af73a7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f6ffa4af73a7
Modified Files:
gdk/gdk_batop.c
gdk/gdk_group.c
Branch: default
Log Message:
some compilation fixes for windows
diffs (37 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -127,7 +127,7 @@ insert_string_bat(BAT *b, BATiter *ni, s
* double-eliminated area */
BUN ecnt = ci->ncand;
if (ni->b->tunique_est > 0 && ecnt > ni->b->tunique_est)
- ecnt = ni->b->tunique_est;
+ ecnt = (BUN)ni->b->tunique_est;
if (r < ecnt)
len = GDK_ELIMLIMIT + (ecnt - r) * len;
else
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -1282,7 +1282,7 @@ BATgroup_internal(BAT **groups, BAT **ex
en->trevsorted = ngrp == 1;
en->tnonil = true;
en->tnil = false;
- en->tunique_est = ngrp;
+ en->tunique_est = (double)ngrp;
*extents = virtualize(en);
}
if (histo) {
@@ -1305,10 +1305,10 @@ BATgroup_internal(BAT **groups, BAT **ex
gn->tnonil = true;
gn->tnil = false;
gn->tmaxpos = maxgrppos;
- gn->tunique_est = ngrp;
+ gn->tunique_est = (double)ngrp;
*groups = gn;
if (!g && !e && !s) {
- b->tunique_est = ngrp;
+ b->tunique_est = (double)ngrp;
}
TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
",g=" ALGOOPTBATFMT ",e=" ALGOOPTBATFMT
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
