Skip to content

Enhance Rcpp::Nullable::as with explicit cast (Closes #1470) #1471

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
eddelbuettel merged 5 commits into from
Apr 13, 2026
+26 −2
Merged

Enhance Rcpp::Nullable::as with explicit cast (Closes #1470) #1471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c40ad4
Enhance Rcpp::Nullable::as with explicit cast (Closes #1470)
eddelbuettel Apr 8, 2026
8215783
Add operator T
eddelbuettel Apr 9, 2026
4422a79
Conditrion nullable<String> test on R 4.3.0 or later
eddelbuettel Apr 9, 2026
9714763
Move the conditional to operator T()
eddelbuettel Apr 9, 2026
8dcc96b
Hide Nullable::operatorT() behind a #define
eddelbuettel Apr 12, 2026
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
Prev Previous commit
Next Next commit
Move the conditional to operator T()
  • Loading branch information
@eddelbuettel
eddelbuettel committed Apr 9, 2026
commit 97147633824d9310fc76ddc5c6b7018fe3841ad4
1 change: 1 addition & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* DESCRIPTION (Version, Date): Roll micro version and date
* inst/include/Rcpp/Nullable.h (T): Also add 'operator T()'
(conditional on R (>= 4.3.0) as older versions croak)

2026-04-08 Dirk Eddelbuettel <edd@debian.org>

Expand Down
2 changes: 2 additions & 0 deletions inst/include/Rcpp/Nullable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ namespace Rcpp {
return m_sexp;
}

#if R_VERSION > R_Version(4,3,0)
/**
* operator T() to return nullable object
*
Expand All @@ -90,6 +91,7 @@ namespace Rcpp {
checkIfSet();
return Rcpp::as<T>(m_sexp);
}
#endif

/**
* get() accessor for object
Expand Down
2 changes: 0 additions & 2 deletions inst/tinytest/cpp/misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,13 @@ SEXP testNullableIsUsable(const Nullable<NumericMatrix>& M) {
}
}

#if R_VERSION > R_Version(4,3,0)
// [[Rcpp::export]]
String testNullableString(Rcpp::Nullable<Rcpp::String> param = R_NilValue) {
if (param.isNotNull())
return String(param);
else
return String("");
}
#endif

// [[Rcpp::export]]
void messageWrapper(SEXP s) {
Expand Down
6 changes: 2 additions & 4 deletions inst/tinytest/test_misc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,8 @@ expect_equal( testNullableIsUsable(M), M)
expect_true(is.null(testNullableIsUsable(NULL)))

## test.NullableString <- function() {
if (getRversion() > "4.3.0") {
expect_equal(testNullableString(), "")
expect_equal(testNullableString("blah"), "blah")
}
expect_equal(testNullableString(), "")
expect_equal(testNullableString("blah"), "blah")

# test.bib <- function() {
expect_true(nchar(Rcpp:::bib()) > 0, info="bib file")
Expand Down
Loading