Skip to content

feat: New END_CPP11_EX() macro that allows parameterizing the return value #421

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: New END_CPP11_EX() macro that allows parameterizing the return value #421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions inst/include/cpp11/declarations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ T& unmove(T&& t) {
SEXP err = R_NilValue; \
char buf[CPP11_ERROR_BUFSIZE] = ""; \
try {
#define END_CPP11 \
#define END_CPP11_EX(RET) \
} \
catch (cpp11::unwind_exception & e) { \
err = e.token; \
Expand All @@ -57,4 +57,5 @@ T& unmove(T&& t) {
} else if (err != R_NilValue) { \
R_ContinueUnwind(err); \
} \
return R_NilValue;
return RET;
#define END_CPP11 END_CPP11_EX(R_NilValue)
Loading