Skip to content

Commit 9bf9dd3

Browse files
Correct commented argument name (#6407)
* Correct commented argument name * also mismatched bmerge() declaration
1 parent c9d990f commit 9bf9dd3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/bmerge.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
163163
protecti += 2;
164164

165165
SEXP ascArg = PROTECT(ScalarInteger(1));
166-
SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), ascArg, /* naArg= */ScalarLogical(FALSE), /* lazyArg= */ScalarLogical(TRUE))); protecti++;
166+
SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), ascArg, /* naArg= */ScalarLogical(FALSE), /* reuseSortingArg= */ScalarLogical(TRUE))); protecti++;
167167
UNPROTECT(2); // down stack to 'ascArg'
168168
PROTECT(oSxp);
169169

src/data.table.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ SEXP dogroups(SEXP dt, SEXP dtcols, SEXP groups, SEXP grpcols, SEXP jiscols,
195195
SEXP on, SEXP verbose, SEXP showProgressArg);
196196

197197
// bmerge.c
198-
SEXP bmerge(SEXP iArg, SEXP xArg, SEXP icolsArg, SEXP xcolsArg,
199-
SEXP xoArg, SEXP rollarg, SEXP rollendsArg, SEXP nomatchArg,
200-
SEXP multArg, SEXP opArg, SEXP nqgrpArg, SEXP nqmaxgrpArg);
198+
SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg,
199+
SEXP xoArg, SEXP rollarg, SEXP rollendsArg, SEXP nomatchArg,
200+
SEXP multArg, SEXP opArg, SEXP nqgrpArg, SEXP nqmaxgrpArg);
201201

202202
// quickselect
203203
double dquickselect(double *x, int n);

0 commit comments

Comments
 (0)