From c2bff9626e272eab619125219f7a62f3f60308bf Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 5 May 2026 07:45:12 -0500 Subject: [PATCH] Make Nullable::operatorT() opt-out as downstream packages adjusted --- ChangeLog | 3 +++ inst/include/Rcpp/Nullable.h | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cb3b96d0..b5cd51f8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2026-05-05 Dirk Eddelbuettel + * inst/include/Rcpp/Nullable.h (Nullable): Switch operatorT() from + opt-in to opt-out as six downstream packages have updated at CRAN + * docker/ci-4.5/Dockerfile: Added based on r-base:4.5.3 * .github/workflows/ci.yaml (jobs): Add rcpp/ci-4.5 to matrix diff --git a/inst/include/Rcpp/Nullable.h b/inst/include/Rcpp/Nullable.h index df0e9248b..e810dbb7e 100644 --- a/inst/include/Rcpp/Nullable.h +++ b/inst/include/Rcpp/Nullable.h @@ -1,8 +1,7 @@ -// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- -// + // Nullable.h: Rcpp R/C++ interface class library -- SEXP container which can be NULL // -// Copyright (C) 2015 Dirk Eddelbuettel and Daniel C. Dillon +// Copyright (C) 2015-2026 Dirk Eddelbuettel and Daniel C. Dillon // // This file is part of Rcpp. // @@ -81,7 +80,7 @@ namespace Rcpp { return m_sexp; } -#if R_VERSION > R_Version(4,3,0) && defined(RCPP_ENABLE_NULLABLE_T) +#if R_VERSION > R_Version(4,3,0) && !defined(RCPP_DISABLE_NULLABLE_T) /** * operator T() to return nullable object *