merge from master

Merge remote-tracking branch 'origin/master' into feature/tbb-solaris

Conflicts:
	NEWS

Author: jjallaire

.Rbuildignore

@@ -1,8 +1,11 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^src/tbb/build/lib_.*$
+^tests/testthat/pkg/RcppParallelTest/src/.*\.s?o$
+^tests/testthat/pkg/RcppParallelTest/src/.*\.dll$
 ^inst/lib$
 ^.travis.yml
+^README.md
 ^doc$
 
 

DESCRIPTION

@@ -15,8 +15,8 @@ Authors@R: c(
     person(family = "Microsoft", role = "cph")
     )
 Description: High level functions for doing parallel programming with Rcpp.
-  For example, the parallelFor function can be used to convert the work of 
-  a standard serial "for" loop into a parallel one and the parallelReduce 
+  For example, the parallelFor() function can be used to convert the work of 
+  a standard serial "for" loop into a parallel one and the parallelReduce() 
   function can be used for accumulating aggregate or other values.
 Suggests: Rcpp, testthat
 SystemRequirements: GNU make, Windows: cmd.exe and cscript.exe

NEWS

@@ -1,10 +1,9 @@
 RcppParallel 4.3.7
 ------------------------------------------------------------------------
 
-* Fix failure to compile with Rtools 3.3
-* Fix failure to compile on OS X Snow Leopard R toolchain
 * Add tbbmalloc library
 * Add support for TBB on Solaris
+* Fix failure to compile on OS X Snow Leopard R toolchain
 
 RcppParallel 4.3.6
 ------------------------------------------------------------------------

man/RcppParallel-package.Rd

@@ -11,9 +11,9 @@
 
   The high level interface enables safe and robust parallel programming without
   direct manipulation of operating system threads. On Windows, OS X, and Linux
-  systems the underlying implementation is based on \href{https://www.threadingbuildingblocks.org/}{Intel TBB} (Threading Building
+  systems the underlying implementation is based on Intel TBB (Threading Building
   Blocks). On other platforms a less-performant fallback implementation based on the
-  \href{http://tinythreadpp.bitsnbites.eu/}{TinyThread} library is used.
+  TinyThread library is used.
 
   For additional documentation see the package website at: \href{http://rcppcore.github.io/RcppParallel}{http://rcppcore.github.io/RcppParallel}.
 }

tests/testthat/test-malloc.R

@@ -1,6 +1,9 @@
 context( "malloc" )
 
 test_that( "tbbmalloc works", {
+    
+    skip_on_cran()
+   
     sourceCpp( "cpp/malloc.cpp" )
 })
 

tests/testthat/test-pkg.R

@@ -2,6 +2,8 @@ context( "package" )
 
 test_that( "linking from a package works", {
 
+   skip_on_cran()
+   
    templib <- tempfile()
    dir.create(templib)