Changeset: 3e79c372a772 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e79c372a772
Modified Files:
gdk/gdk_aggr.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (29 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2055,7 +2055,12 @@ BATgroupsize(BAT *b, BAT *g, BAT *e, BAT
} while (0)
static BAT *
-BATgroupminmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error, BUN (*minmax)(oid *, BAT *, const oid *, BUN, oid, oid, BUN,
BUN, const oid *, const oid *, BUN, int, int), const char *name)
+BATgroupminmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils,
+ int abort_on_error,
+ BUN (*minmax)(oid *restrict, BAT *, const oid *restrict, BUN,
+ oid, oid, BUN, BUN, const oid *restrict,
+ const oid *, BUN, int, int),
+ const char *name)
{
const oid *restrict gids;
oid min, max;
@@ -2117,8 +2122,9 @@ BATgroupminmax(BAT *b, BAT *g, BAT *e, B
static void *
BATminmax(BAT *b, void *aggr,
- BUN (*minmax)(oid *, BAT *, const oid *, BUN, oid, oid, BUN, BUN,
- const oid *, const oid *, BUN, int, int))
+ BUN (*minmax)(oid *restrict, BAT *, const oid *restrict, BUN,
+ oid, oid, BUN, BUN, const oid *restrict,
+ const oid *, BUN, int, int))
{
oid pos;
void *res;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
