Skip to content

Commit 11eeb28

Browse files
committed
Update licensing information.
1 parent 6d52687 commit 11eeb28

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

README.md

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
## RcppParallel Package
22

3-
[![Travis-CI Build Status](https://travis-ci.org/jolars/RcppParallel.svg?branch=master)](https://travis-ci.org/jolars/RcppParallel)
4-
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/jolars/RcppParallel?branch=master&svg=true)](https://ci.appveyor.com/project/jolars/RcppParallel)
3+
[![Travis-CI Build Status](https://travis-ci.org/RcppCore/RcppParallel.svg?branch=master)](https://travis-ci.org/RcppCore/RcppParallel)
54

65
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` function can be used for accumulating aggregate or other values.
76

@@ -15,20 +14,4 @@ The RcppParallel package is made available under the [GPLv2](http://www.gnu.org/
1514

1615
The TinyThread library is licensed under the [zlib/libpng](http://www.opensource.org/licenses/zlib-license.php) license as described [here](https://gitorious.org/tinythread/tinythreadpp/source/master:README.txt).
1716

18-
The Intel TBB Library is licensed under the GPLv2 (as described at https://www.threadingbuildingblocks.org/Licensing):
19-
20-
TBB and other open-source software available from this site is licensed under GPLv2 with the (libstdc++) runtime exception. Specifically, the TBB open-source license is the same license used by the GNU libstdc++ library in gcc 4.2.1 (and earlier). For a complete description of the license, please visit the official GNU website for [GPLv2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) and for the [runtime exception](https://www.threadingbuildingblocks.org/licensing#runtime-exception).
21-
22-
**Runtime Exception**
23-
24-
```
25-
As a special exception, you may use this file as part of a free software
26-
library without restriction. Specifically, if other files instantiate
27-
templates or use macros or inline functions from this file, or you compile
28-
this file and link it with other files to produce an executable, this
29-
file does not by itself cause the resulting executable to be covered by
30-
the GNU General Public License. This exception does not however
31-
invalidate any other reasons why the executable file might be covered by
32-
the GNU General Public License.
33-
```
34-
17+
The Intel TBB Library is licensed under the Apache 2.0 (as described at https://www.threadingbuildingblocks.org/faq/10).

0 commit comments

Comments
 (0)