Changeset: ccefbc6f35a2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccefbc6f35a2 Modified Files: gdk/gdk_mvcc.c gdk/gdk_mvcc.h Branch: newstorage Log Message:
use proper result type (size_t) to fix compilation on windows diffs (24 lines): diff --git a/gdk/gdk_mvcc.c b/gdk/gdk_mvcc.c --- a/gdk/gdk_mvcc.c +++ b/gdk/gdk_mvcc.c @@ -331,7 +331,7 @@ mvcc_count( mvcc_t *m, ts_t sts, ts_t *t return total; } -int +size_t mvcc_rids( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, oid *r, BUN start, BUN nr) { BUN i = 0, j; diff --git a/gdk/gdk_mvcc.h b/gdk/gdk_mvcc.h --- a/gdk/gdk_mvcc.h +++ b/gdk/gdk_mvcc.h @@ -36,7 +36,7 @@ extern int mvcc_release( mvcc_t *m, oid extern int mvcc_is_new( mvcc_t *m, oid p, BUN nr, ts_t sts, ts_t wts); /* return success if row(s) is (are) new. */ -extern int mvcc_rids( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, oid *r, BUN start, BUN nr); +extern size_t mvcc_rids( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, oid *r, BUN start, BUN nr); extern BUN mvcc_count( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, rid_type flag); typedef int (*mvcc_f)(void *data, oid r, BUN nr); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list