Changeset: 2dca12df7cdc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2dca12df7cdc Modified Files: gdk/gdk_analytic_bounds.c gdk/gdk_string.c Branch: window-tunning Log Message:
More compilation fixes diffs (27 lines): diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c --- a/gdk/gdk_analytic_bounds.c +++ b/gdk/gdk_analytic_bounds.c @@ -872,9 +872,9 @@ GDKanalyticalrowbounds(BAT *r, BAT *b, B } else if (is_lng_nil(limit) || limit < 0) { goto invalid_bound; } else if (preceding) { - ANALYTICAL_WINDOW_BOUNDS_BRANCHES_ROWS(_PRECEDING, lng, limit, olimit); + ANALYTICAL_WINDOW_BOUNDS_BRANCHES_ROWS(_PRECEDING, lng, limit, (oid) olimit); } else { - ANALYTICAL_WINDOW_BOUNDS_BRANCHES_ROWS(_FOLLOWING, lng, limit, olimit); + ANALYTICAL_WINDOW_BOUNDS_BRANCHES_ROWS(_FOLLOWING, lng, limit, (oid) olimit); } } diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c --- a/gdk/gdk_string.c +++ b/gdk/gdk_string.c @@ -1271,7 +1271,7 @@ BATgroupstr_group_concat(BAT *b, BAT *g, empty = true; \ for (; k < i;) { \ str nsep, nstr; \ - lng m = k; \ + oid m = k; \ j = k; \ do { \ k++; \ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list