From 6065514d994a8684890bec35844f8776cdd4e6bb Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Mon, 26 Aug 2024 23:01:50 -0700 Subject: [PATCH 1/2] Correct commented argument name --- src/bmerge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bmerge.c b/src/bmerge.c index 64b0cafa7b..6cf970ca27 100644 --- a/src/bmerge.c +++ b/src/bmerge.c @@ -163,7 +163,7 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r protecti += 2; SEXP ascArg = PROTECT(ScalarInteger(1)); - SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), ascArg, /* naArg= */ScalarLogical(FALSE), /* lazyArg= */ScalarLogical(TRUE))); protecti++; + SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), ascArg, /* naArg= */ScalarLogical(FALSE), /* reuseSortingArg= */ScalarLogical(TRUE))); protecti++; UNPROTECT(2); // down stack to 'ascArg' PROTECT(oSxp); From caec41ad5b7bb04c7b0696744f553b2d241cec32 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Mon, 26 Aug 2024 23:04:53 -0700 Subject: [PATCH 2/2] also mismatched bmerge() declaration --- src/data.table.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data.table.h b/src/data.table.h index 4d4bed225c..bedc1619b8 100644 --- a/src/data.table.h +++ b/src/data.table.h @@ -195,9 +195,9 @@ SEXP dogroups(SEXP dt, SEXP dtcols, SEXP groups, SEXP grpcols, SEXP jiscols, SEXP on, SEXP verbose, SEXP showProgressArg); // bmerge.c -SEXP bmerge(SEXP iArg, SEXP xArg, SEXP icolsArg, SEXP xcolsArg, - SEXP xoArg, SEXP rollarg, SEXP rollendsArg, SEXP nomatchArg, - SEXP multArg, SEXP opArg, SEXP nqgrpArg, SEXP nqmaxgrpArg); +SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, + SEXP xoArg, SEXP rollarg, SEXP rollendsArg, SEXP nomatchArg, + SEXP multArg, SEXP opArg, SEXP nqgrpArg, SEXP nqmaxgrpArg); // quickselect double dquickselect(double *x, int n);