Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
^.*\.Rproj$
^\.Rproj\.user$
^TODO$
^sandbox/.*
^sandbox$
^vignettes/(?![^\.]*(\.html\.asis|\.html)$).*
^cran-comments\.md$
^\.github$
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: parglm
Type: Package
Title: Parallel GLM
Version: 0.1.7
Version: 0.1.8
Authors@R: c(
person("Benjamin", "Christoffersen",
email = "boennecd@gmail.com",
Expand All @@ -20,13 +20,12 @@ URL: https://github.com/boennecd/parglm
BugReports: https://github.com/boennecd/parglm/issues
LinkingTo: Rcpp, RcppArmadillo
Imports: Rcpp, Matrix
SystemRequirements: C++11
Suggests: testthat,
SuppDists,
knitr,
rmarkdown,
speedglm,
microbenchmark,
R.rsp
RoxygenNote: 6.1.1
RoxygenNote: 7.3.3
VignetteBuilder: R.rsp
37 changes: 30 additions & 7 deletions man/parglm.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions man/parglm.control.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions parglm.Rproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ StripTrailingWhitespace: Yes
BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
PackageRoxygenize: rd,collate,namespace
4 changes: 2 additions & 2 deletions src/thread_pool.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,10 @@ class thread_pool

public:
template<typename FunctionType>
std::future<typename std::result_of<FunctionType()>::type>
std::future<typename std::invoke_result<FunctionType>::type>
submit(FunctionType f)
{
typedef typename std::result_of<FunctionType()>::type result_type;
typedef typename std::invoke_result<FunctionType>::type result_type;

std::packaged_task<result_type()> task(std::move(f));
std::future<result_type> res(task.get_future());
Expand Down