Skip to content

R/Module.R: avoid calling as.character on a C++Object #461

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 1 commit into from
Apr 13, 2016
Merged

R/Module.R: avoid calling as.character on a C++Object #461

Show file tree
Hide file tree
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
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-04-11 Ben Goodrich <goodrich.ben@gmail.com>
* R/Module.R: Avoid calling as.character() on a C++Object to prevent race

2016-04-02 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION: Rolled to minor version 0.12.4.3
Expand Down
6 changes: 3 additions & 3 deletions R/Module.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ setMethod("initialize", "Module",

.get_Module_Class <- function( x, name, pointer = .getModulePointer(x) ){
value <- .Call( Module__get_class, pointer, name )
value@generator <- get("refClassGenerators",envir=x)[[as.character(value)]]
value@generator <- get("refClassGenerators", envir=x)[[value@.Data]]
value
}

Expand Down Expand Up @@ -215,7 +215,7 @@ Module <- function( module, PACKAGE = methods::getPackageName(where), where = to
for( i in seq_along(classes) ){
CLASS <- classes[[i]]

clname <- as.character(CLASS)
clname <- CLASS@.Data

fields <- cpp_fields( CLASS, where )
methods <- cpp_refMethods(CLASS, where)
Expand Down Expand Up @@ -276,7 +276,7 @@ Module <- function( module, PACKAGE = methods::getPackageName(where), where = to

for( i in seq_along(classes) ){
CLASS <- classes[[i]]
clname <- as.character(CLASS)
clname <- CLASS@.Data
demangled_name <- sub( "^Rcpp_", "", clname )
.classes_map[[ CLASS@typeid ]] <- storage[[ demangled_name ]] <- .get_Module_Class( module, demangled_name, xp )

Expand Down