Skip to content

Untag token upon removal from the precious list #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 14, 2022
Merged

Untag token upon removal from the precious list #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ec783f
untag token upon removal from the precious list
Enchufa2 Mar 13, 2022
39f8aa5
update ChangeLog
Enchufa2 Mar 13, 2022
673b6da
undo test override from 1.0.8.3
eddelbuettel Mar 13, 2022
54d50a9
rolling minor version
eddelbuettel Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2022-03-14 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
* inst/include/Rcpp/config.h: Idem

2022-03-13 Iñaki Ucar <iucar@fedoraproject.org>

* src/barrier.cpp: Untag tokens upon removal from the precious list,
so that the internal reference counter can be safely decremented by R

2022-03-13 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.8.3
Date: 2022-03-13
Version: 1.0.8.4
Date: 2022-03-14
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
4 changes: 3 additions & 1 deletion inst/NEWS.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
\newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}}
\newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}}

\section{Changes in Rcpp hotfix release version 1.0.8.3 (2022-03-13)}{
\section{Changes in Rcpp hotfix release version 1.0.8.4 (2022-03-14)}{
\itemize{
\item Changes in Rcpp API:
\itemize{
Expand All @@ -13,6 +13,8 @@
\code{std::unary_function} and \code{std::binary_function} with
\code{std::function} (Dirk in \ghpr{1202} fixing \ghit{1201} and
CRAN request)
\code Upon removal from precious list, the tag is set to null
(Iñaki in \ghpr{1205} fixing \ghit{1203})
}
\item Changes in Rcpp Documentation:
\itemize{
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.8"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,8,3)
#define RCPP_DEV_VERSION_STRING "1.0.8.3"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,8,4)
#define RCPP_DEV_VERSION_STRING "1.0.8.4"

#endif
3 changes: 2 additions & 1 deletion src/barrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// barrier.cpp: Rcpp R/C++ interface class library -- write barrier
//
// Copyright (C) 2010 - 2020 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2021 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
// Copyright (C) 2021 - 2022 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -119,6 +119,7 @@ void Rcpp_precious_remove(SEXP token) {
if (token == R_NilValue || TYPEOF(token) != LISTSXP) {
return;
}
SET_TAG(token, R_NilValue);
SEXP before = CAR(token);
SEXP after = CDR(token);
SETCDR(before, after);
Expand Down
2 changes: 1 addition & 1 deletion tests/tinytest.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (requireNamespace("tinytest", quietly=TRUE)) {

## Force tests to be executed if in dev release which we define as
## having a sub-release, eg 0.9.15.5 is one whereas 0.9.16 is not
if (FALSE && length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) { # dev rel, and
if (length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) { # dev rel, and
if (Sys.getenv("RunAllRcppTests") != "no") { # if env.var not yet set
message("Setting \"RunAllRcppTests\"=\"yes\" for development release\n")
Sys.setenv("RunAllRcppTests"="yes")
Expand Down