Changeset: 403221ef1190 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/403221ef1190 Modified Files: clients/Tests/exports.stable.out gdk/gdk_calc.h monetdb5/mal/mal_stack.h Branch: default Log Message:
small renaming diffs (51 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -162,10 +162,10 @@ gdk_return BATleftjoin(BAT **r1p, BAT ** gdk_return BATmarkjoin(BAT **r1p, BAT **r2p, BAT **r3p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, BUN estimate) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__access__(write_only, 3))) __attribute__((__warn_unused_result__)); BAT *BATmaskedcands(oid hseq, BUN nr, BAT *masked, bool selected); void *BATmax(BAT *b, void *aggr); -void *BATmax_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil); +void *BATmax_skipnil(allocator *, BAT *b, void *aggr, bit skipnil); BAT *BATmergecand(BAT *a, BAT *b); void *BATmin(BAT *b, void *aggr); -void *BATmin_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil); +void *BATmin_skipnil(allocator *, BAT *b, void *aggr, bit skipnil); gdk_return BATmode(BAT *b, bool transient); BAT *BATnegcands(oid tseq, BUN nr, BAT *odels); BAT *BATnil_grp(BAT *l, BAT *g, BAT *e, BAT *s); @@ -1193,7 +1193,7 @@ const char raiseRef[]; const char rangejoinRef[]; const char rankRef[]; const char rapiRef[]; -MalStkPtr reallocGlobalStack(allocator *alloc, MalStkPtr s, int cnt); +MalStkPtr reallocGlobalStack(allocator *ma, MalStkPtr s, int cnt); const char reconnectRef[]; str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); const char registerRef[]; diff --git a/gdk/gdk_calc.h b/gdk/gdk_calc.h --- a/gdk/gdk_calc.h +++ b/gdk/gdk_calc.h @@ -148,8 +148,8 @@ gdk_export gdk_return BATsum(void *res, gdk_export gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool nil_if_empty); gdk_export void *BATmax(BAT *b, void *aggr); gdk_export void *BATmin(BAT *b, void *aggr); -gdk_export void *BATmax_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil); -gdk_export void *BATmin_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil); +gdk_export void *BATmax_skipnil(allocator *, BAT *b, void *aggr, bit skipnil); +gdk_export void *BATmin_skipnil(allocator *, BAT *b, void *aggr, bit skipnil); gdk_export dbl BATcalcstdev_population(dbl *avgp, BAT *b); gdk_export dbl BATcalcstdev_sample(dbl *avgp, BAT *b); diff --git a/monetdb5/mal/mal_stack.h b/monetdb5/mal/mal_stack.h --- a/monetdb5/mal/mal_stack.h +++ b/monetdb5/mal/mal_stack.h @@ -17,7 +17,7 @@ #define stackSize(CNT) (sizeof(ValRecord)*(CNT) + offsetof(MalStack, stk)) mal_export MalStkPtr newGlobalStack(allocator *ma, int size); -mal_export MalStkPtr reallocGlobalStack(allocator *alloc, MalStkPtr s, int cnt); +mal_export MalStkPtr reallocGlobalStack(allocator *ma, MalStkPtr s, int cnt); mal_export void clearStack(MalStkPtr s); mal_export void freeStack(MalStkPtr stk); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
