Merge remote-tracking branch 'Rcpp/master' into develop

hsbadr · hsbadr · commit 7c13d4e85bb6 · 2020-12-05T07:39:47.000-05:00
diff --git a/inst/include/RcppParallel.h b/inst/include/RcppParallel.h
@@ -34,7 +34,7 @@ inline void parallelFor(std::size_t begin,
                         std::size_t grainSize = 1,
                         int numThreads = -1)
 {
-   grainSize = resolveValue("RCPP_PARALLEL_GRAIN_SIZE", grainSize, 1);
+   grainSize = resolveValue("RCPP_PARALLEL_GRAIN_SIZE", grainSize, 1u);
    numThreads = resolveValue("RCPP_PARALLEL_NUM_THREADS", numThreads, -1);
    
 #if RCPP_PARALLEL_USE_TBB
diff --git a/inst/include/RcppParallel/RMatrix.h b/inst/include/RcppParallel/RMatrix.h
@@ -204,7 +204,7 @@ class RMatrix {
    {
    }
 
-   inline RMatrix(const T* data, std::size_t nrow, std::size_t ncol) 
+   inline RMatrix(T* data, std::size_t nrow, std::size_t ncol) 
       : data_(data), nrow_(nrow), ncol_(ncol) 
    {
    }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ inline void parallelFor(std::size_t begin,`
`34`	`34`	`std::size_t grainSize = 1,`
`35`	`35`	`int numThreads = -1)`
`36`	`36`	`{`
`37`		`- grainSize = resolveValue("RCPP_PARALLEL_GRAIN_SIZE", grainSize, 1);`
	`37`	`+ grainSize = resolveValue("RCPP_PARALLEL_GRAIN_SIZE", grainSize, 1u);`
`38`	`38`	`numThreads = resolveValue("RCPP_PARALLEL_NUM_THREADS", numThreads, -1);`
`39`	`39`
`40`	`40`	`#if RCPP_PARALLEL_USE_TBB`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ class RMatrix {`
`204`	`204`	`{`
`205`	`205`	`}`
`206`	`206`
`207`		`- inline RMatrix(const T* data, std::size_t nrow, std::size_t ncol)`
	`207`	`+ inline RMatrix(T* data, std::size_t nrow, std::size_t ncol)`
`208`	`208`	`: data_(data), nrow_(nrow), ncol_(ncol)`
`209`	`209`	`{`
`210`	`210`	`}`