Skip to content

Commit 5307acb

Browse files
author
kalibera
committed
Avoid call through incompatible function pointer.
git-svn-id: https://svn.r-project.org/R/trunk@87513 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent ab69f59 commit 5307acb

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/main/main.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 1998-2023 The R Core Team
3+
* Copyright (C) 1998-2025 The R Core Team
44
* Copyright (C) 2002-2005 The R Foundation
55
* Copyright (C) 1995, 1996 Robert Gentleman and Ross Ihaka
66
*
@@ -1959,6 +1959,11 @@ R_taskCallbackRoutine(SEXP expr, SEXP value, Rboolean succeeded,
19591959
return(again);
19601960
}
19611961

1962+
static void releaseObjectFinalizer(void *data)
1963+
{
1964+
R_ReleaseObject((SEXP)data);
1965+
}
1966+
19621967
attribute_hidden SEXP
19631968
R_addTaskCallback(SEXP f, SEXP data, SEXP useData, SEXP name)
19641969
{
@@ -1978,7 +1983,7 @@ R_addTaskCallback(SEXP f, SEXP data, SEXP useData, SEXP name)
19781983

19791984
PROTECT(index = allocVector(INTSXP, 1));
19801985
el = Rf_addTaskCallback(R_taskCallbackRoutine, internalData,
1981-
(void (*)(void*)) R_ReleaseObject, tmpName,
1986+
releaseObjectFinalizer, tmpName,
19821987
INTEGER(index));
19831988

19841989
if(length(name) == 0) {

0 commit comments

Comments
 (0)