Skip to content

correct empty return call (closes #588) #589

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 2 commits into from
Nov 13, 2016
Merged

correct empty return call (closes #588) #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3898e26
correct empty return call (closes #588)
eddelbuettel Nov 13, 2016
ac03008
Merge branch 'master' into bugfix/issue588
eddelbuettel Nov 13, 2016
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
3 changes: 3 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2016-11-13 Dirk Eddelbuettel <edd@debian.org>

* R/Attributes.R (mergeIntoBuildEnv): Correct 'empty' return
2016-11-13 Daniel C. Dillon <dcdillon@gmail.com>
* inst/include/Rcpp/RNGScope.h: Moved definition of RNGScope
to its own file
Expand Down
4 changes: 2 additions & 2 deletions R/Attributes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,15 +618,15 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {

# protect against null or empty string
if (is.null(value) || !nzchar(value))
return;
return(invisible(NULL))

# if it doesn't exist already just set it
if (is.null(buildEnv[[name]])) {
buildEnv[[name]] <<- value
}
# if it's not identical then append
else if (!identical(buildEnv[[name]], value)) {
buildEnv[[name]] <<- paste(buildEnv[[name]], value);
buildEnv[[name]] <<- paste(buildEnv[[name]], value)
}
else {
# it already exists and it's the same value, this
Expand Down