Skip to content
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

Unit tests for readProtoFiles2 #45

Merged
merged 4 commits into from
May 22, 2018
Merged

Unit tests for readProtoFiles2 #45

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4057635
Export a function to reset the descriptor pool
siddharthab May 21, 2018
6d63968
Unit tests for more complex proto imports
siddharthab Jan 19, 2018
0ebe478
Merge branch 'master' into unit
siddharthab May 21, 2018
a28faeb
Add PACKAGE argument to .Call for resetDescriptorPool
siddharthab May 21, 2018
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
2 changes: 1 addition & 1 deletion R/internals.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ readProtoFiles2 <- function(files,
}

resetDescriptorPool <- function(){
.Call( "resetDescriptorPool_cpp" )
.Call( "resetDescriptorPool_cpp", PACKAGE = "RProtoBuf" )
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to say we don't need this -- but then I realized that this package is still old-school not using Rcpp Attributes. Adding this follow the code convention even though we now also register symbols so I think it is not strictly needed -- but won't harm or hurt.

readProtoFiles2( protoPath=system.file( "proto", package="RProtoBuf", lib.loc=.RProtoBuf_libname) )
invisible(NULL)
}
Expand Down