Skip to content

Commit 9541993

Browse files
betajippitybetajippity
committed
Updated TBB (OSX/Win) to 4.3 Initial Release
1 parent 8a0038f commit 9541993

File tree

114 files changed

+4866
-3624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+4866
-3624
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Nuparu
22
======
33

4-
v0.1.14.25
4+
v0.1.14.45
55

66
Third Party dependencies and foundation libraries for Karl's graphics projects
77

@@ -18,7 +18,7 @@ Nuparu currently consists of:
1818
* [Partio](http://www.disneyanimation.com/technology/partio.html) 1.1.0 (OSX/Win)
1919
* [RMSD](http://boscoh.com/code/) (OSX/Linux/Win)
2020
* [OpenEXR](http://www.openexr.com) 2.1.0 (OSX/Win)
21-
* [TBB](https://www.threadingbuildingblocks.org/) 4.2 Update 5 (OSX/Win)
21+
* [TBB](https://www.threadingbuildingblocks.org/) 4.3 Initial Release (OSX/Win)
2222
* [Zlib](http://www.zlib.net/) 1.2.8 (Win)
2323
* [Boost](www.boost.org) 1.55.0 (OSX/Linux/Win)
2424

‎include/serial/tbb/parallel_for.h‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
/*
22
Copyright 2005-2014 Intel Corporation. All Rights Reserved.
33
4-
This file is part of Threading Building Blocks.
5-
6-
Threading Building Blocks is free software; you can redistribute it
7-
and/or modify it under the terms of the GNU General Public License
8-
version 2 as published by the Free Software Foundation.
9-
10-
Threading Building Blocks is distributed in the hope that it will be
11-
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
12-
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with Threading Building Blocks; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18-
19-
As a special exception, you may use this file as part of a free software
20-
library without restriction. Specifically, if other files instantiate
21-
templates or use macros or inline functions from this file, or you compile
22-
this file and link it with other files to produce an executable, this
23-
file does not by itself cause the resulting executable to be covered by
24-
the GNU General Public License. This exception does not however
25-
invalidate any other reasons why the executable file might be covered by
26-
the GNU General Public License.
4+
This file is part of Threading Building Blocks. Threading Building Blocks is free software;
5+
you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
version 2 as published by the Free Software Foundation. Threading Building Blocks is
7+
distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
8+
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9+
See the GNU General Public License for more details. You should have received a copy of
10+
the GNU General Public License along with Threading Building Blocks; if not, write to the
11+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12+
13+
As a special exception, you may use this file as part of a free software library without
14+
restriction. Specifically, if other files instantiate templates or use macros or inline
15+
functions from this file, or you compile this file and link it with other files to produce
16+
an executable, this file does not by itself cause the resulting executable to be covered
17+
by the GNU General Public License. This exception does not however invalidate any other
18+
reasons why the executable file might be covered by the GNU General Public License.
2719
*/
2820

2921
#ifndef __TBB_SERIAL_parallel_for_H

‎include/serial/tbb/tbb_annotate.h‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
/*
22
Copyright 2005-2014 Intel Corporation. All Rights Reserved.
33
4-
This file is part of Threading Building Blocks.
5-
6-
Threading Building Blocks is free software; you can redistribute it
7-
and/or modify it under the terms of the GNU General Public License
8-
version 2 as published by the Free Software Foundation.
9-
10-
Threading Building Blocks is distributed in the hope that it will be
11-
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
12-
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with Threading Building Blocks; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18-
19-
As a special exception, you may use this file as part of a free software
20-
library without restriction. Specifically, if other files instantiate
21-
templates or use macros or inline functions from this file, or you compile
22-
this file and link it with other files to produce an executable, this
23-
file does not by itself cause the resulting executable to be covered by
24-
the GNU General Public License. This exception does not however
25-
invalidate any other reasons why the executable file might be covered by
26-
the GNU General Public License.
4+
This file is part of Threading Building Blocks. Threading Building Blocks is free software;
5+
you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
version 2 as published by the Free Software Foundation. Threading Building Blocks is
7+
distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
8+
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9+
See the GNU General Public License for more details. You should have received a copy of
10+
the GNU General Public License along with Threading Building Blocks; if not, write to the
11+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12+
13+
As a special exception, you may use this file as part of a free software library without
14+
restriction. Specifically, if other files instantiate templates or use macros or inline
15+
functions from this file, or you compile this file and link it with other files to produce
16+
an executable, this file does not by itself cause the resulting executable to be covered
17+
by the GNU General Public License. This exception does not however invalidate any other
18+
reasons why the executable file might be covered by the GNU General Public License.
2719
*/
2820

2921
#ifndef __TBB_annotate_H

‎include/tbb/aggregator.h‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
/*
22
Copyright 2005-2014 Intel Corporation. All Rights Reserved.
33
4-
This file is part of Threading Building Blocks.
5-
6-
Threading Building Blocks is free software; you can redistribute it
7-
and/or modify it under the terms of the GNU General Public License
8-
version 2 as published by the Free Software Foundation.
9-
10-
Threading Building Blocks is distributed in the hope that it will be
11-
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
12-
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with Threading Building Blocks; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18-
19-
As a special exception, you may use this file as part of a free software
20-
library without restriction. Specifically, if other files instantiate
21-
templates or use macros or inline functions from this file, or you compile
22-
this file and link it with other files to produce an executable, this
23-
file does not by itself cause the resulting executable to be covered by
24-
the GNU General Public License. This exception does not however
25-
invalidate any other reasons why the executable file might be covered by
26-
the GNU General Public License.
4+
This file is part of Threading Building Blocks. Threading Building Blocks is free software;
5+
you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
version 2 as published by the Free Software Foundation. Threading Building Blocks is
7+
distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
8+
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9+
See the GNU General Public License for more details. You should have received a copy of
10+
the GNU General Public License along with Threading Building Blocks; if not, write to the
11+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12+
13+
As a special exception, you may use this file as part of a free software library without
14+
restriction. Specifically, if other files instantiate templates or use macros or inline
15+
functions from this file, or you compile this file and link it with other files to produce
16+
an executable, this file does not by itself cause the resulting executable to be covered
17+
by the GNU General Public License. This exception does not however invalidate any other
18+
reasons why the executable file might be covered by the GNU General Public License.
2719
*/
2820

2921
#ifndef __TBB__aggregator_H

‎include/tbb/aligned_space.h‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
/*
22
Copyright 2005-2014 Intel Corporation. All Rights Reserved.
33
4-
This file is part of Threading Building Blocks.
5-
6-
Threading Building Blocks is free software; you can redistribute it
7-
and/or modify it under the terms of the GNU General Public License
8-
version 2 as published by the Free Software Foundation.
9-
10-
Threading Building Blocks is distributed in the hope that it will be
11-
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
12-
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with Threading Building Blocks; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18-
19-
As a special exception, you may use this file as part of a free software
20-
library without restriction. Specifically, if other files instantiate
21-
templates or use macros or inline functions from this file, or you compile
22-
this file and link it with other files to produce an executable, this
23-
file does not by itself cause the resulting executable to be covered by
24-
the GNU General Public License. This exception does not however
25-
invalidate any other reasons why the executable file might be covered by
26-
the GNU General Public License.
4+
This file is part of Threading Building Blocks. Threading Building Blocks is free software;
5+
you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
version 2 as published by the Free Software Foundation. Threading Building Blocks is
7+
distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
8+
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9+
See the GNU General Public License for more details. You should have received a copy of
10+
the GNU General Public License along with Threading Building Blocks; if not, write to the
11+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12+
13+
As a special exception, you may use this file as part of a free software library without
14+
restriction. Specifically, if other files instantiate templates or use macros or inline
15+
functions from this file, or you compile this file and link it with other files to produce
16+
an executable, this file does not by itself cause the resulting executable to be covered
17+
by the GNU General Public License. This exception does not however invalidate any other
18+
reasons why the executable file might be covered by the GNU General Public License.
2719
*/
2820

2921
#ifndef __TBB_aligned_space_H

‎include/tbb/atomic.h‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
/*
22
Copyright 2005-2014 Intel Corporation. All Rights Reserved.
33
4-
This file is part of Threading Building Blocks.
5-
6-
Threading Building Blocks is free software; you can redistribute it
7-
and/or modify it under the terms of the GNU General Public License
8-
version 2 as published by the Free Software Foundation.
9-
10-
Threading Building Blocks is distributed in the hope that it will be
11-
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
12-
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with Threading Building Blocks; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18-
19-
As a special exception, you may use this file as part of a free software
20-
library without restriction. Specifically, if other files instantiate
21-
templates or use macros or inline functions from this file, or you compile
22-
this file and link it with other files to produce an executable, this
23-
file does not by itself cause the resulting executable to be covered by
24-
the GNU General Public License. This exception does not however
25-
invalidate any other reasons why the executable file might be covered by
26-
the GNU General Public License.
4+
This file is part of Threading Building Blocks. Threading Building Blocks is free software;
5+
you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
version 2 as published by the Free Software Foundation. Threading Building Blocks is
7+
distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
8+
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9+
See the GNU General Public License for more details. You should have received a copy of
10+
the GNU General Public License along with Threading Building Blocks; if not, write to the
11+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12+
13+
As a special exception, you may use this file as part of a free software library without
14+
restriction. Specifically, if other files instantiate templates or use macros or inline
15+
functions from this file, or you compile this file and link it with other files to produce
16+
an executable, this file does not by itself cause the resulting executable to be covered
17+
by the GNU General Public License. This exception does not however invalidate any other
18+
reasons why the executable file might be covered by the GNU General Public License.
2719
*/
2820

2921
#ifndef __TBB_atomic_H
@@ -527,7 +519,7 @@ template <memory_semantics M, typename T>
527519
T load ( const atomic<T>& a ) { return a.template load<M>(); }
528520

529521
template <memory_semantics M, typename T>
530-
void store ( atomic<T>& a, T value ) { return a.template store<M>(value); }
522+
void store ( atomic<T>& a, T value ) { a.template store<M>(value); }
531523

532524
namespace interface6{
533525
//! Make an atomic for use in an initialization (list), as an alternative to zero-initialization or normal assignment.

‎include/tbb/blocked_range.h‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
/*
22
Copyright 2005-2014 Intel Corporation. All Rights Reserved.
33
4-
This file is part of Threading Building Blocks.
5-
6-
Threading Building Blocks is free software; you can redistribute it
7-
and/or modify it under the terms of the GNU General Public License
8-
version 2 as published by the Free Software Foundation.
9-
10-
Threading Building Blocks is distributed in the hope that it will be
11-
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
12-
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with Threading Building Blocks; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18-
19-
As a special exception, you may use this file as part of a free software
20-
library without restriction. Specifically, if other files instantiate
21-
templates or use macros or inline functions from this file, or you compile
22-
this file and link it with other files to produce an executable, this
23-
file does not by itself cause the resulting executable to be covered by
24-
the GNU General Public License. This exception does not however
25-
invalidate any other reasons why the executable file might be covered by
26-
the GNU General Public License.
4+
This file is part of Threading Building Blocks. Threading Building Blocks is free software;
5+
you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
version 2 as published by the Free Software Foundation. Threading Building Blocks is
7+
distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
8+
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9+
See the GNU General Public License for more details. You should have received a copy of
10+
the GNU General Public License along with Threading Building Blocks; if not, write to the
11+
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12+
13+
As a special exception, you may use this file as part of a free software library without
14+
restriction. Specifically, if other files instantiate templates or use macros or inline
15+
functions from this file, or you compile this file and link it with other files to produce
16+
an executable, this file does not by itself cause the resulting executable to be covered
17+
by the GNU General Public License. This exception does not however invalidate any other
18+
reasons why the executable file might be covered by the GNU General Public License.
2719
*/
2820

2921
#ifndef __TBB_blocked_range_H
@@ -105,7 +97,7 @@ class blocked_range {
10597
__TBB_ASSERT( !(my_begin < r.my_end) && !(r.my_end < my_begin), "blocked_range has been split incorrectly" );
10698
}
10799

108-
#if !TBB_DEPRECATED
100+
#if __TBB_USE_PROPORTIONAL_SPLIT_IN_BLOCKED_RANGES
109101
//! Static field to support proportional split
110102
static const bool is_divisible_in_proportion = true;
111103

@@ -120,7 +112,7 @@ class blocked_range {
120112
// only comparison 'less than' is required from values of blocked_range objects
121113
__TBB_ASSERT( !(my_begin < r.my_end) && !(r.my_end < my_begin), "blocked_range has been split incorrectly" );
122114
}
123-
#endif
115+
#endif /* __TBB_USE_PROPORTIONAL_SPLIT_IN_BLOCKED_RANGES */
124116

125117
private:
126118
/** NOTE: my_end MUST be declared before my_begin, otherwise the forking constructor will break. */
@@ -138,7 +130,7 @@ class blocked_range {
138130
return middle;
139131
}
140132

141-
#if !TBB_DEPRECATED
133+
#if __TBB_USE_PROPORTIONAL_SPLIT_IN_BLOCKED_RANGES
142134
static Value do_split( blocked_range& r, proportional_split& proportion )
143135
{
144136
__TBB_ASSERT( r.is_divisible(), "cannot split blocked_range that is not divisible" );
@@ -153,7 +145,7 @@ class blocked_range {
153145
/ float(proportion.left() + proportion.right()) + 0.5f);
154146
return r.my_end = Value(r.my_end - right_part);
155147
}
156-
#endif
148+
#endif /* __TBB_USE_PROPORTIONAL_SPLIT_IN_BLOCKED_RANGES */
157149

158150
template<typename RowValue, typename ColValue>
159151
friend class blocked_range2d;

0 commit comments

Comments
 (0)