Skip to content

Commit 73a8987

Browse files
authored
Make Nullable::operatorT() opt-out as downstream packages adjusted (#1477)
1 parent 0e2b485 commit 73a8987

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
2026-05-05 Dirk Eddelbuettel <edd@debian.org>
22

3+
* inst/include/Rcpp/Nullable.h (Nullable): Switch operatorT() from
4+
opt-in to opt-out as six downstream packages have updated at CRAN
5+
36
* docker/ci-4.5/Dockerfile: Added based on r-base:4.5.3
47
* .github/workflows/ci.yaml (jobs): Add rcpp/ci-4.5 to matrix
58

inst/include/Rcpp/Nullable.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
2-
//
1+
32
// Nullable.h: Rcpp R/C++ interface class library -- SEXP container which can be NULL
43
//
5-
// Copyright (C) 2015 Dirk Eddelbuettel and Daniel C. Dillon
4+
// Copyright (C) 2015-2026 Dirk Eddelbuettel and Daniel C. Dillon
65
//
76
// This file is part of Rcpp.
87
//
@@ -81,7 +80,7 @@ namespace Rcpp {
8180
return m_sexp;
8281
}
8382

84-
#if R_VERSION > R_Version(4,3,0) && defined(RCPP_ENABLE_NULLABLE_T)
83+
#if R_VERSION > R_Version(4,3,0) && !defined(RCPP_DISABLE_NULLABLE_T)
8584
/**
8685
* operator T() to return nullable object
8786
*

0 commit comments

Comments
 (0)