Skip to content

Commit 2b7d3da

Browse files
Correct commented argument name (#6407)
* Correct commented argument name * also mismatched bmerge() declaration
1 parent be97437 commit 2b7d3da

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/bmerge.c

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ SEXP dogroups(SEXP dt, SEXP dtcols, SEXP groups, SEXP grpcols, SEXP jiscols,
196196
SEXP on, SEXP verbose, SEXP showProgressArg);
197197

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

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

0 commit comments

Comments
 (0)