Committing Intel(R) TBB 2017 source code

.gitattributes

@@ -1,45 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.c text
-*.h text
-*.cpp text
-*.def text
-*.rc text
-*.i text
-*.sh text
-*.csh text
-*.mk text
-*.java text
-*.csv text
-*.lst text
-*.asm text
-*.cfg text
-*.css text
-*.inc text
-*.js text
-*.rb text
-*.strings text
-*.txt text
-*export.lst text
-*.xml text
-*.py text
-*.md text
-*.classpath text
-*.cproject text
-*.project text
-*.properties text
-*.java text
-*.gradle text
-
-# Declare files that will always have CRLF line endings on checkout.
-*.sln text eol=crlf
-*.bat text eol=crlf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary
-*.ico binary
-*.spir binary

.gitignore

@@ -1,86 +0,0 @@
-# Ignore the debug and release directories created with Makefile builds #
-#########################################################################
-build/*_debug/
-build/*_release/
-
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.lib
-*.pdb
-*.exe
-*.o
-*.so
-*.so.1
-*.so.2
-*.dylib
-*.a
-*.obj
-*.pyc
-
-*.orig
-*.raw
-*.sample
-*.slo
-*.swp
-*.config
-*.la
-*.lai
-*.lo
-*.nhdr
-*.nii.gz
-*.nrrd
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.tgz
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# IDE generated files #
-######################
-/.ninja_deps
-/.ninja_log
-/build.ninja
-/rules.ninja
-*~
-.emacs.desktop
-
-# Build system generated files #
-################################
-CMakeCache.txt
-CMakeFiles/
-
-# Other #
-#########
-.clang_complete
-.idea
-.svn
-crash*
-*.tmp

CHANGES

@@ -2,223 +2,6 @@
 The list of most significant changes made over time in
 Intel(R) Threading Building Blocks (Intel(R) TBB).
 
-Intel TBB 2018 Update 1
-TBB_INTERFACE_VERSION == 10001
-
-Changes (w.r.t. Intel TBB 2018):
-
-- Added lambda-friendly overloads for parallel_scan.
-- Added support of static and simple partitioners in
-    parallel_deterministic_reduce.
-
-Preview Features:
-
-- Added initial support for Flow Graph Analyzer to parallel_for.
-- Added reservation support in overwrite_node and write_once_node.
-
-Bugs fixed:
-
-- Fixed a potential deadlock scenario in the flow graph that affected
-    Intel TBB 2018.
-
-------------------------------------------------------------------------
-Intel TBB 2018
-TBB_INTERFACE_VERSION == 10000
-
-Changes (w.r.t. Intel TBB 2017 Update 7):
-
-- Introduced Parallel STL, an implementation of the C++ standard
-    library algorithms with support for execution policies. For more
-    information, see Getting Started with Parallel STL
-    (https://software.intel.com/en-us/get-started-with-pstl).
-- this_task_arena::isolate() function is now a fully supported feature.
-- this_task_arena::isolate() function and task_arena::execute() method
-    were extended to pass on the value returned by the executed functor
-    (requires C++11).
-- task_arena::enqueue() and task_group::run() methods extended to accept
-    move-only functors.
-- A flow graph now spawns all tasks into the same task arena,
-    and waiting for graph completion also happens in that arena.
-- Improved support for Flow Graph Analyzer in async_node, opencl_node,
-    and composite_node.
-- Added support for Android* NDK r15, r15b.
-- Added support for Universal Windows Platform.
-- Increased minimally supported version of macOS*
-    (MACOSX_DEPLOYMENT_TARGET) to 10.11.
-
-Changes affecting backward compatibility:
-
-- Internal layout changes in some flow graph classes;
-- Several undocumented methods are removed from class graph,
-    including set_active() and is_active().
-- Due to incompatible changes, the namespace version is updated
-    for the flow graph; recompilation is recommended for all
-    binaries that use the flow graph classes.
-
-Preview Features:
-
-- opencl_node can be used with any graph object; class opencl_graph
-    is removed.
-- graph::wait_for_all() now automatically waits for all not yet consumed
-    async_msg objects.
-- Improved concurrent_lru_cache::handle_object to support C++11 move
-    semantics, default construction, and conversion to bool.
-
-Bugs fixed:
-
-- Fixed a bug preventing use of streaming_node and opencl_node with
-    Clang; inspired by a contribution from Francisco Facioni.
-- Fixed this_task_arena::isolate() function to work correctly with
-    parallel_invoke and parallel_do algorithms.
-- Fixed a memory leak in composite_node.
-- Fixed an assertion failure in debug tbbmalloc binaries when
-    TBBMALLOC_CLEAN_ALL_BUFFERS is used.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 8
-TBB_INTERFACE_VERSION == 9108
-
-Changes (w.r.t. Intel TBB 2017 Update 7):
-
-Bugs fixed:
-
-- Fixed an assertion failure in debug tbbmalloc binaries when
-    TBBMALLOC_CLEAN_ALL_BUFFERS is used.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 7
-TBB_INTERFACE_VERSION == 9107
-
-Changes (w.r.t. Intel TBB 2017 Update 6):
-
-- In the huge pages mode, the memory allocator now is also able to use
-    transparent huge pages.
-
-Preview Features:
-
-- Added support for Intel TBB integration into CMake-aware
-    projects, with valuable guidance and feedback provided by Brad King
-    (Kitware).
-
-Bugs fixed:
-
-- Fixed scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, 0)
-    to process memory left after exited threads.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 6
-TBB_INTERFACE_VERSION == 9106
-
-Changes (w.r.t. Intel TBB 2017 Update 5):
-
-- Added support for Android* NDK r14.
-
-Preview Features:
-
-- Added a blocking terminate extension to the task_scheduler_init class
-    that allows an object to wait for termination of worker threads.
-
-Bugs fixed:
-
-- Fixed compilation and testing issues with MinGW (GCC 6).
-- Fixed compilation with /std:c++latest option of VS 2017
-    (https://github.com/01org/tbb/issues/13).
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 5
-TBB_INTERFACE_VERSION == 9105
-
-Changes (w.r.t. Intel TBB 2017 Update 4):
-
-- Added support for Microsoft* Visual Studio* 2017.
-- Added graph/matmult example to demonstrate support for compute offload
-    to Intel(R) Graphics Technology in the flow graph API.
-- The "compiler" build option now allows to specify a full path to the
-    compiler.
-
-Changes affecting backward compatibility:
-
-- Constructors for many classes, including graph nodes, concurrent
-    containers, thread-local containers, etc., are declared explicit and
-    cannot be used for implicit conversions anymore.
-
-Bugs fixed:
-
-- Added a workaround for bug 16657 in the GNU C Library (glibc)
-    affecting the debug version of tbb::mutex.
-- Fixed a crash in pool_identify() called for an object allocated in
-    another thread.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 4
-TBB_INTERFACE_VERSION == 9104
-
-Changes (w.r.t. Intel TBB 2017 Update 3):
-
-- Added support for C++11 move semantics in parallel_do.
-- Added support for FreeBSD* 11.
-
-Changes affecting backward compatibility:
-
-- Minimal compiler versions required for support of C++11 move semantics
-    raised to GCC 4.5, VS 2012, and Intel(R) C++ Compiler 14.0.
-
-Bugs fixed:
-
-- The workaround for crashes in the library compiled with GCC 6
-    (-flifetime-dse=1) was extended to Windows*.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 3
-TBB_INTERFACE_VERSION == 9103
-
-Changes (w.r.t. Intel TBB 2017 Update 2):
-
-- Added support for Android* 7.0 and Android* NDK r13, r13b.
-
-Preview Features:
-
-- Added template class gfx_factory to the flow graph API. It implements
-    the Factory concept for streaming_node to offload computations to
-    Intel(R) processor graphics.
-
-Bugs fixed:
-
-- Fixed a possible deadlock caused by missed wakeup signals in
-    task_arena::execute().
-
-Open-source contributions integrated:
-
-- A build fix for Linux* s390x platform by Jerry J.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 2
-TBB_INTERFACE_VERSION == 9102
-
-Changes (w.r.t. Intel TBB 2017 Update 1):
-
-- Removed the long-outdated support for Xbox* consoles.
-
-Bugs fixed:
-
-- Fixed the issue with task_arena::execute() not being processed when
-    the calling thread cannot join the arena.
-- Fixed dynamic memory allocation replacement failure on macOS* 10.12.
-
-------------------------------------------------------------------------
-Intel TBB 2017 Update 1
-TBB_INTERFACE_VERSION == 9101
-
-Changes (w.r.t. Intel TBB 2017):
-
-Bugs fixed:
-
-- Fixed dynamic memory allocation replacement failures on Windows* 10
-    Anniversary Update.
-- Fixed emplace() method of concurrent unordered containers to not
-    require a copy constructor.
-
-------------------------------------------------------------------------
 Intel TBB 2017
 TBB_INTERFACE_VERSION == 9100
 
@@ -293,26 +76,6 @@ Open-source contributions integrated:
 
 - Enabling use of C++11 'override' keyword by Raf Schietekat.
 
-------------------------------------------------------------------------
-Intel TBB 4.4 Update 6
-TBB_INTERFACE_VERSION == 9006
-
-Changes (w.r.t. Intel TBB 4.4 Update 5):
-
-- For 64-bit platforms, quadrupled the worst-case limit on the amount
-    of memory the Intel TBB allocator can handle.
-
-Bugs fixed:
-
-- Fixed a memory corruption in the memory allocator when it meets
-    internal limits.
-- Fixed the memory allocator on 64-bit platforms to align memory
-    to 16 bytes by default for all allocations bigger than 8 bytes.
-- Fixed parallel_scan to provide correct result if the initial value
-    of an accumulator is not the operation identity value.
-- As a workaround for crashes in the Intel TBB library compiled with
-    GCC 6, added -flifetime-dse=1 to compilation options on Linux* OS.
-
 ------------------------------------------------------------------------
 Intel TBB 4.4 Update 5
 TBB_INTERFACE_VERSION == 9005
@@ -2436,8 +2199,7 @@ Packaging:
     are provided separately on Intel(R) Premier.
 
 ------------------------------------------------------------------------
-Intel, the Intel logo, Xeon, Intel Xeon Phi, and Cilk are registered
-trademarks or trademarks of Intel Corporation or its subsidiaries in
-the United States and other countries.
+Intel and Cilk are registered trademarks or trademarks of Intel Corporation or its
+subsidiaries in the United States and other countries.
 
 * Other names and brands may be claimed as the property of others.

Makefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

README.md

@@ -1,25 +1,18 @@
-# Intel(R) Threading Building Blocks 2018 Update 1
+# Intel(R) Threading Building Blocks 2017
+[![Stable release](https://img.shields.io/badge/version-2017-green.svg)] (https://github.com/01org/tbb/releases/tag/2017)
 [![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)
 
 Intel(R) Threading Building Blocks (Intel(R) TBB) lets you easily write parallel C++ programs that take
 full advantage of multicore performance, that are portable, composable and have future-proof scalability.
 
 ## Release Information
-Here are the latest [Changes](CHANGES) and [Release Notes](doc/Release_Notes.txt) (contains system requirements and known issues).
-
-## tbb_tutorials branch information
-This release provides additional TBB examples for workshops, conferences, etc.
-Head revision contains tutorials for all events and code base for the latest event. To get tutorials with original code base, please use specific tags.
-
-*  [SC 17](https://sc17.supercomputing.org/) - code base: TBB 2018 U1 - tag: [tutorials_sc17](https://github.com/01org/tbb/tree/tutorials_sc17)
-    * [doc/sc17_slides](doc/sc17_slides)
-    * [examples/sc17_hands_on](examples/sc17_hands_on): exercises depend on OpenCV 3.1.0, exercise 2 requires a video file (sc17_hands_on/input/input.avi) that is not part of this branch
-    * [examples/sc17_hetero](examples/sc17_hetero): exercises 3, 4 and 5 depend on OpenCL\*
+Here are the latest [Changes] (CHANGES) and [Release Notes]
+(doc/Release_Notes.txt) (contains system requirements and known issues).
 
 ## Documentation
-* Intel(R) TBB [tutorial](https://software.intel.com/en-us/tbb-tutorial)
-* Intel(R) TBB general documentation: [stable](https://software.intel.com/en-us/tbb-documentation)
-and [latest](https://www.threadingbuildingblocks.org/docs/help/index.htm)
+* Intel(R) TBB [tutorial] (https://software.intel.com/en-us/tbb-tutorial)
+* Intel(R) TBB general documentation: [stable] (https://software.intel.com/en-us/tbb-documentation)
+and [latest] (https://www.threadingbuildingblocks.org/docs/help/index.htm)
 
 ## Support
 Please report issues and suggestions via
@@ -27,10 +20,7 @@ Please report issues and suggestions via
 [Intel(R) TBB forum](http://software.intel.com/en-us/forums/intel-threading-building-blocks/).
 
 ## How to Contribute
-Please, read the instructions on the official [Intel(R) TBB open source site](https://www.threadingbuildingblocks.org/submit-contribution).
-
-## Engineering team contacts
-* [E-mail us.](mailto:inteltbbdevelopers@intel.com)
+Please, read the instructions on the official [Intel(R) TBB open source site] (https://www.threadingbuildingblocks.org/submit-contribution).
 
 ------------------------------------------------------------------------
 Intel and the Intel logo are trademarks of Intel Corporation or its subsidiaries in the U.S. and/or other countries.

build/AIX.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/AIX.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/FreeBSD.clang.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ CPLUS = clang++
 CONLY = clang
 LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
 LIBS += -lpthread -lrt
-LINK_FLAGS = -Wl,-rpath-link=. -Wl,-rpath=. -rdynamic
+LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
 C_FLAGS = $(CPLUS_FLAGS)
 
 ifeq ($(cfg), release)

build/FreeBSD.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/FreeBSD.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,14 +29,14 @@ ifndef arch
 endif
 
 ifndef runtime
-        clang_version:=$(shell clang -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/")
+        gcc_version:=$(shell gcc -dumpversion)
         os_version:=$(shell uname -r)
         os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//')
-        export runtime:=cc$(clang_version)_kernel$(os_kernel_version)
+        export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)
 endif
 
-native_compiler := clang
-export compiler ?= clang
+native_compiler := gcc
+export compiler ?= gcc
 debugger ?= gdb
 
 CMD=$(SHELL) -c

build/Makefile.rml

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 #
 #
 
-# TODO: investigate why version_string.ver is not complete when $(RML_SERVER.OBJ) is being compiled.
-.NOTPARALLEL:
-
 tbb_root ?= $(TBBROOT)
 BUILDING_PHASE=1
 TEST_RESOURCE = $(RML.RES)
@@ -87,7 +84,7 @@ ifeq (linux,$(tbb_os))
 omp_dynamic_link.$(OBJ): CPLUS_FLAGS+=-fno-exceptions
 endif
 
-tbb_misc_rml.$(OBJ) $(RML_SERVER.OBJ): version_string.ver
+tbb_misc_rml.$(OBJ): version_string.ver
 
 RML_TEST.OBJ = test_job_automaton.$(OBJ) test_thread_monitor.$(OBJ) test_rml_tbb.$(OBJ) test_rml_omp.$(OBJ) test_rml_mixed.$(OBJ)
 
@@ -105,7 +102,6 @@ LIB_LINK_FLAGS += $(EXPORT_KEY)rml.def
 $(RML.DLL): rml.def
 endif
 
-$(RML.DLL): CPLUS_FLAGS += $(SDL_FLAGS)
 $(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
 $(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
 	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)

build/Makefile.tbb

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 tbb_root ?= "$(TBBROOT)"
 BUILDING_PHASE=1
 include $(tbb_root)/build/common.inc
-CPLUS_FLAGS += $(SDL_FLAGS)
 DEBUG_SUFFIX=$(findstring _debug,_$(cfg))
 
 #------------------------------------------------------------

build/Makefile.tbbmalloc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -82,8 +82,6 @@ MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
 $(MALLOC.DLL): tbbmalloc.def
 endif
 
-$(MALLOC.DLL) $(MALLOCPROXY.DLL): CPLUS_FLAGS += $(SDL_FLAGS)
-$(MALLOC.DLL) $(MALLOCPROXY.DLL): M_CPLUS_FLAGS += $(SDL_FLAGS)
 $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
 $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
 	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
@@ -147,12 +145,6 @@ endif
 # -----------------------------------------------------
 
 # ------------ Set test specific variables ------------
-# TODO: implement accurate warning suppression for tests to unify with Makefile.test.
-$(MALLOC_TESTS): CPLUS_FLAGS += $(TEST_WARNING_KEY) $(if $(no_exceptions),$(DEFINE_KEY)__TBB_TEST_NO_EXCEPTIONS=1)
-$(MALLOC_TESTS): M_CPLUS_FLAGS += $(TEST_WARNING_KEY) $(if $(no_exceptions),$(DEFINE_KEY)__TBB_TEST_NO_EXCEPTIONS=1)
-$(MALLOC_TESTS): INCLUDES += $(INCLUDE_TEST_HEADERS)
-$(MALLOC_TESTS): M_INCLUDES += $(INCLUDE_TEST_HEADERS)
-
 ifeq (windows.gcc,$(tbb_os).$(compiler))
 test_malloc_overload.$(TEST_EXT): LIBS += $(MALLOCPROXY.LIB)
 endif
@@ -165,6 +157,8 @@ MALLOC_LINK_PROXY_TESTS = test_malloc_overload_proxy.$(TEST_EXT)
 MALLOC_ADD_DLL_TESTS =    test_malloc_lib_unload.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT) \
         test_malloc_atexit.$(TEST_EXT)
 
+# TODO: implement accurate warning suppression for tests to unify with Makefile.test.
+
 $(MALLOC_M_CPLUS_TESTS): CPLUS_FLAGS=$(M_CPLUS_FLAGS)
 $(MALLOC_M_CPLUS_TESTS): INCLUDES=$(M_INCLUDES)
 $(MALLOC_NO_LIB_TESTS): LINK_MALLOC.LIB=
@@ -202,8 +196,8 @@ test_malloc_whitebox.$(TEST_EXT): LINK_FILES+=$(MALLOC_ASM.OBJ)
 
 # Some _dll targets need to restore variables since they are changed by parent
 # target-specific rule of its .exe targets
-test_malloc_lib_unload_dll.$(DLL): CPLUS_FLAGS=$(ORIG_CPLUS_FLAGS) $(if $(no_exceptions),$(DEFINE_KEY)__TBB_TEST_NO_EXCEPTIONS=1)
-test_malloc_lib_unload_dll.$(DLL): INCLUDES=$(ORIG_INCLUDES) $(INCLUDE_TEST_HEADERS)
+test_malloc_lib_unload_dll.$(DLL): CPLUS_FLAGS=$(ORIG_CPLUS_FLAGS)
+test_malloc_lib_unload_dll.$(DLL): INCLUDES=$(ORIG_INCLUDES)
 
 test_malloc_used_by_lib_dll.$(DLL): CPLUS_FLAGS=$(subst /MT,/LD,$(M_CPLUS_FLAGS))
 test_malloc_used_by_lib_dll.$(DLL): LINK_FILES+=$(ORIG_LINK_MALLOC.LIB)

build/Makefile.tbbproxy

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/Makefile.test

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,9 +35,7 @@ DEBUG_SUFFIX=$(findstring _debug,$(call cross_cfg,_$(cfg)))
 #------------------------------------------------------------
 
 VPATH = $(tbb_root)/src/tbb/$(ASSEMBLY_SOURCE) $(tbb_root)/src/tbb $(tbb_root)/src/rml/client $(tbb_root)/src/old $(tbb_root)/src/test $(tbb_root)/src/perf
-CPLUS_FLAGS += $(if $(crosstest),$(DEFINE_KEY)__TBB_NO_IMPLICIT_LINKAGE=1) \
-               $(if $(no_exceptions),$(DEFINE_KEY)__TBB_TEST_NO_EXCEPTIONS=1) \
-               $(if $(LINK_TBB.LIB),$(DEFINE_KEY)TEST_USES_TBB=1)
+CPLUS_FLAGS += $(if $(crosstest),$(DEFINE_KEY)__TBB_NO_IMPLICIT_LINKAGE=1) $(if $(LINK_TBB.LIB),$(DEFINE_KEY)TEST_USES_TBB=1)
 
 TEST_PREREQUISITE+=$(TBB.LIB)
 LINK_FILES+=$(LINK_TBB.LIB)
@@ -65,15 +63,14 @@ SCHEDULER_DEPENDENCIES = $(TBB_ASM.OBJ) tbb_misc.$(OBJ)
 
 # These executables don't depend on the TBB library, but include core .cpp files directly
 SCHEDULER_DIRECTLY_INCLUDED = test_task_leaks.$(TEST_EXT) \
-    test_task_assertions.$(TEST_EXT) \
-    test_fast_random.$(TEST_EXT) \
-    test_global_control_whitebox.$(TEST_EXT) \
-    test_concurrent_queue_whitebox.$(TEST_EXT)
+ test_task_assertions.$(TEST_EXT) \
+ test_fast_random.$(TEST_EXT) \
+ test_global_control_whitebox.$(TEST_EXT) \
+ test_concurrent_queue_whitebox.$(TEST_EXT)
 
 # Necessary to locate version_string.ver referenced from directly included tbb_misc.cpp
 INCLUDES += $(INCLUDE_KEY). $(INCLUDE_TEST_HEADERS)
 
-$(SCHEDULER_DIRECTLY_INCLUDED): CPLUS_FLAGS += $(DSE_KEY)
 $(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
 $(SCHEDULER_DIRECTLY_INCLUDED): LIBS += $(LIBDL)
 #tbb.lib must not be linked to scheduler white box tests in order to not violate ODR
@@ -103,16 +100,12 @@ $(TWICE_LINKED_TESTS): LINK_FILES+=$(@:.$(TEST_EXT)=_secondary.$(OBJ))
 test_dynamic_link%.$(TEST_EXT): LINK_TBB.LIB =
 test_dynamic_link.$(TEST_EXT): LIBS += $(LIBDL)
 
-# Resolving issue with the number of sections that an object file can contain
-ifneq (,$(BIGOBJ_KEY))
-TEST_BIGOBJ = test_opencl_node.$(TEST_EXT)      \
-    test_atomic.$(TEST_EXT)                     \
-    test_concurrent_unordered_set.$(TEST_EXT)   \
-    test_concurrent_unordered_map.$(TEST_EXT)   \
-    test_join_node_key_matching.$(TEST_EXT)     \
-    test_join_node_msg_key_matching.$(TEST_EXT) \
-    test_join_node.$(TEST_EXT)
-$(TEST_BIGOBJ): override CXXFLAGS += $(BIGOBJ_KEY)
+TEST_BIG_OBJ = test_opencl_node.$(TEST_EXT) test_join_node.$(TEST_EXT) test_atomic.$(TEST_EXT)
+
+ifeq (windows_windows,$(tbb_os)_$(target))
+ifneq (gcc,$(compiler))
+$(TEST_BIG_OBJ): override CXXFLAGS += /bigobj
+endif
 endif
 
 # TODO: remove repetition of .$(TEST_EXT) in the list bellow
@@ -190,8 +183,6 @@ TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT)   \
 	test_function_node.$(TEST_EXT)               \
 	test_limiter_node.$(TEST_EXT)                \
 	test_join_node.$(TEST_EXT)                   \
-	test_join_node_key_matching.$(TEST_EXT)      \
-	test_join_node_msg_key_matching.$(TEST_EXT)  \
 	test_buffer_node.$(TEST_EXT)                 \
 	test_queue_node.$(TEST_EXT)                  \
 	test_priority_queue_node.$(TEST_EXT)         \
@@ -216,12 +207,6 @@ TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT)   \
 	test_async_msg.$(TEST_EXT)                   \
 	test_tbb_version.$(TEST_EXT)                 # insert new files right above
 
-# These tests depend on other technologies
-TEST_TBB_SPECIAL.EXE = test_openmp.$(TEST_EXT) \
-    test_cilk_interop.$(TEST_EXT)              \
-    test_gfx_factory.$(TEST_EXT)               \
-    test_opencl_node.$(TEST_EXT)
-
 # skip mode_plugin for now
 skip_tests += test_model_plugin
 
@@ -240,7 +225,6 @@ ifdef CILK_AVAILABLE
 # The issue reveals itself if a version of binutils is prior to 2.17
 ifeq (linux_icc,$(tbb_os)_$(compiler))
 test_cilk_interop.$(TEST_EXT): LIBS += -lcilkrts
-test_gfx_factory.$(TEST_EXT): LIBS += -lcilkrts
 endif
 test_tbb_cilk: test_cilk_interop.$(TEST_EXT)
 	$(run_cmd) ./test_cilk_interop.$(TEST_EXT) $(args)
@@ -251,7 +235,7 @@ endif
 
 test_opencl_node.$(TEST_EXT): LIBS += $(OPENCL.LIB)
 
-$(TEST_TBB_PLAIN.EXE) $(TEST_TBB_SPECIAL.EXE): WARNING_KEY += $(TEST_WARNING_KEY)
+$(TEST_TBB_PLAIN.EXE): WARNING_KEY += $(TEST_WARNING_KEY)
 
 # Run tests that are in SCHEDULER_DIRECTLY_INCLUDED and TEST_TBB_PLAIN.EXE but not in skip_tests (which is specified by user)
 TESTS_TO_RUN := $(filter-out $(addsuffix .$(TEST_EXT),$(skip_tests)),$(TEST_TBB_PLAIN.EXE) $(SCHEDULER_DIRECTLY_INCLUDED))
@@ -271,7 +255,7 @@ test_tbb_plain: $(TEST_PREREQUISITE) $(TESTS_TO_RUN)
 
 
 # For deprecated files, we don't mind warnings etc., thus compilation rules are most relaxed
-CPLUS_FLAGS_DEPRECATED = $(DEFINE_KEY)__TBB_TEST_DEPRECATED=1 $(subst $(WARNING_KEY),,$(CPLUS_FLAGS)) $(WARNING_SUPPRESS) $(INCLUDE_KEY)$(tbb_root)/src/test
+CPLUS_FLAGS_DEPRECATED = $(DEFINE_KEY)TBB_DEPRECATED=1 $(subst $(WARNING_KEY),,$(CPLUS_FLAGS)) $(WARNING_SUPPRESS) $(INCLUDE_KEY)$(tbb_root)/src/test
 TEST_TBB_OLD.OBJ = test_concurrent_vector_v2.$(OBJ) test_concurrent_queue_v2.$(OBJ) test_mutex_v2.$(OBJ) test_task_scheduler_observer_v3.$(OBJ) 
 
 $(TEST_TBB_OLD.OBJ): CPLUS_FLAGS := $(CPLUS_FLAGS_DEPRECATED)

build/SunOS.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/SunOS.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/SunOS.suncc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/android.clang.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ OUTPUTOBJ_KEY = -o #
 PIC_KEY = -fPIC
 WARNING_AS_ERROR_KEY = -Werror
 WARNING_KEY = -Wall
-SDL_FLAGS = -fPIE -fPIC -fstack-protector -Wformat -Wformat-security
+SDL_FLAGS = -fPIE -fPIC -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
 TEST_WARNING_KEY = -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor -Wextra
 
 WARNING_SUPPRESS = -Wno-parentheses -Wno-non-virtual-dtor
@@ -50,13 +50,13 @@ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
 C_FLAGS = $(CPLUS_FLAGS)
 
 ifeq ($(cfg), release)
-    SDL_FLAGS += -D_FORTIFY_SOURCE=2
     CPLUS_FLAGS = -O2
 endif
 ifeq ($(cfg), debug)
     CPLUS_FLAGS = -g -O0 $(DEFINE_KEY)TBB_USE_DEBUG
 endif
 
+CPLUS_FLAGS += $(SDL_FLAGS)
 CPLUS_FLAGS += $(DEFINE_KEY)USE_PTHREAD $(DEFINE_KEY)_GLIBCXX_HAVE_FENV_H
 
 ifneq (,$(findstring $(arch),ia32 intel64))
@@ -71,7 +71,7 @@ endif
 CPLUS_FLAGS    += --sysroot=$(SYSROOT)
 LIB_LINK_FLAGS += --sysroot=$(SYSROOT)
 LIBS           = -L$(CPLUS_LIB_PATH) -lc++_shared
-ifeq (,$(findstring $(ndk_version),$(foreach v, 7 8 9 10 11,r$(v) r$(v)b r$(v)c r$(v)d r$(v)e)))
+ifneq (,$(findstring r12, $(ndk_version)))
     LIBS +=  -lc++abi
     ifeq (arm,$(arch))
         LIBS += -lunwind 

build/android.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/android.icc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/android.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/android.linux.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@ ifeq (64,$(findstring 64,$(arch)))
     def_prefix = lin64
 endif
 
-ifdef ndk_version
+ifdef ANDROID_NDK_ROOT
+    ndk_version:= $(lastword $(subst -, ,$(ANDROID_NDK_ROOT)))
     $(warning "NDK version $(ndk_version)")
 else
     $(warning "NDK version not set in environment, using \'unknown\' instead.")

build/android.linux.launcher.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/android.macos.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@ ifeq (64,$(findstring 64,$(arch)))
     def_prefix = lin64
 endif
 
-ifdef ndk_version
+ifdef ANDROID_NDK_ROOT
+    ndk_version:= $(lastword $(subst -, ,$(ANDROID_NDK_ROOT)))
     $(warning "NDK version $(ndk_version)")
 else
     $(warning "NDK version not set in environment, using \'unknown\' instead.")

build/android.windows.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,10 @@ ifeq (64,$(findstring 64,$(arch)))
     def_prefix = lin64
 endif
 
-ifdef ndk_version
+ifdef ANDROID_NDK_ROOT
+    ndk_version:= $(lastword $(subst -, ,$(ANDROID_NDK_ROOT)))
+    ndk_version:= $(firstword $(subst /, ,$(ndk_version)))
+    ndk_version:= $(firstword $(subst \, ,$(ndk_version)))
     $(warning "NDK version $(ndk_version)")
 else
     $(warning "NDK version not set in environment, using \'unknown\' instead.")
@@ -73,6 +76,3 @@ DLL = so
 
 TEST_LAUNCHER=
 run_cmd ?= -sh $(tbb_root)/build/android.linux.launcher.sh $(largs)
-export UNIXMODE = 1
-# Clang for Android* uses the INCLUDE variable (instead of CPATH)
-export USE_INCLUDE_ENV = 1

build/big_iron.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/common.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,18 +39,13 @@ ifndef tbb_os
 
 endif # !tbb_os
 
-ifeq (1,$(tbb_cpf))
+ifeq ($(tbb_cpf),1)
   export CPF_SUFFIX ?=_preview
 endif
 
-ifeq (0,$(exceptions))
-# Inverse the value, for simplicity of use
-  export no_exceptions=1
-endif
-
 ifdef cpp0x
     $(warning "Warning: deprecated cpp0x=$(cpp0x) is used, stdver must be used instead. Building in stdver=c++0x mode.")
-    export stdver?=c++0x
+    export stdver ?= c++0x
     override cpp0x=
 endif
 
@@ -58,13 +53,14 @@ ifneq (,$(stdver))
     ifeq (,$(findstring ++, $(stdver)))
         $(warning "Warning: unexpected stdver=$(stdver) is used.")
     endif
-    CXX_STD_FLAGS=-std=$(stdver)
+
+    CXX_STD_FLAGS = -std=$(stdver) -D_TBB_CPP0X
 endif
 
 # The requested option is added unconditionally.
 # If it is not supported, a compiler warning or error is expected.
 # Note that CXX_STD_FLAGS can be changed in <os>.<compiler>.inc.
-CXX_ONLY_FLAGS+=$(CXX_STD_FLAGS)
+CXX_ONLY_FLAGS += $(CXX_STD_FLAGS)
 
 ifeq (,$(wildcard $(tbb_root)/build/$(tbb_os).inc))
   $(error "$(tbb_os)" is not supported. Add build/$(tbb_os).inc file with os-specific settings )
@@ -104,23 +100,23 @@ cross_cfg = $(if $(crosstest),$(call flip_cfg,$(1)),$(1))
 # Setting default configuration to release
 cfg?=release
 
-compiler_name=$(notdir $(compiler))
 ifdef BUILDING_PHASE
+
  ifndef target
   target:=$(tbb_os)
  endif
  # process host/target compiler-dependent build configuration
- ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler_name).inc))
-  $(error "$(compiler_name)" is not supported on $(target). Add build/$(target).$(compiler_name).inc file with compiler-specific settings. )
+ ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler).inc))
+  $(error "$(compiler)" is not supported on $(target). Add build/$(target).$(compiler).inc file with compiler-specific settings. )
  endif
- include $(tbb_root)/build/$(target).$(compiler_name).inc
+ include $(tbb_root)/build/$(target).$(compiler).inc
 endif
 
 ifneq ($(BUILDING_PHASE),1)
  # definitions for top-level Makefiles
  origin_build_dir:=$(origin tbb_build_dir)
  tbb_build_dir?=$(tbb_root)$(SLASH)build
- export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler_name)_$(runtime)$(CPF_SUFFIX)
+ export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler)_$(runtime)$(CPF_SUFFIX)
  work_dir=$(tbb_build_dir)$(SLASH)$(tbb_build_prefix)
 endif  # BUILDING_PHASE != 1
 

build/common_rules.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,12 +46,9 @@ endif
 INCLUDES += $(INCLUDE_KEY)$(tbb_root)/src $(INCLUDE_KEY)$(tbb_root)/src/rml/include $(INCLUDE_KEY)$(tbb_root)/include
 
 CPLUS_FLAGS += $(WARNING_KEY) $(CXXFLAGS)
-ifeq (1,$(tbb_cpf))
+ifeq ($(tbb_cpf),1)
 CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
 endif
-ifeq (0,$(exceptions))
-CPLUS_FLAGS += $(DEFINE_KEY)TBB_USE_EXCEPTIONS=0
-endif
 LINK_FLAGS += $(LDFLAGS)
 LIB_LINK_FLAGS += $(LDFLAGS)
 
@@ -152,7 +149,7 @@ $(TBB.MANIFEST):
 version_string.ver: $(TBB.MANIFEST)
 	$(MAKE_VERSIONS)
 	cmd /C "echo #define TBB_MANIFEST 1 >> version_string.ver"
-# TODO: fix parallel build by writing to a temporary file and rename it when complete
+# TODO: fix parallel build by writting to a temporary file and rename it when complete
 else
 # TODO: make version strings directly representative for all the libraries
 version_string.ver:

build/detect.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2017 Intel Corporation
+// Copyright (c) 2005-2016 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,184 +16,166 @@
 //
 //
 
-function readAllFromFile(fname) {
-    var fso = new ActiveXObject("Scripting.FileSystemObject");
-    var file = null;
-    try {
-        file = fso.OpenTextFile(fname, 1, 0);
-        return (file.readAll());
-    } finally {
-        // Close the file in the finally section to guarantee that it will be closed in any case
-        // (if the exception is thrown or not).
-        file.Close();
-    }
-}
-
 function doWork() {
-    var WshShell = WScript.CreateObject("WScript.Shell");
+		var WshShell = WScript.CreateObject("WScript.Shell");
 
-    var tmpExec = WshShell.Run("cmd /c echo int main(){return 0;} >detect.c", 0, true);
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
 
-    // The next block deals with GCC (MinGW)
-    if (WScript.Arguments.Count() > 1) {
-        var compilerPath = WScript.Arguments(1);
-        // The RegExp matches everything up to and including the last slash (it uses a greedy approach.)
-        var compilerName = compilerPath.replace(/^.*[\/\\]/, "");
-        if (compilerName.match(/gcc/i) != null) {
-            if (WScript.Arguments(0) == "/arch") {
-                // Get predefined macros
-                tmpExec = WshShell.Run("cmd /C " + compilerPath + " -dM -E detect.c > detect.map", 0, true);
-                var defs = readAllFromFile("detect.map");
-                //detect target architecture
-                var intel64 = /x86_64|amd64/mgi;
-                var ia32 = /i386/mgi;
-                if (defs.match(intel64)) {
-                    WScript.Echo("intel64");
-                } else if (defs.match(ia32)) {
-                    WScript.Echo("ia32");
-                } else {
-                    WScript.Echo("unknown");
-                }
-            } else {
-                tmpExec = WshShell.Exec(compilerPath + " -dumpversion");
-                var gccVersion = tmpExec.StdOut.ReadLine();
-                if (WScript.Arguments(0) == "/runtime") {
-                    WScript.Echo("mingw" + gccVersion);
-                }
-                else if (WScript.Arguments(0) == "/minversion") {
-                    // Comparing strings, not numbers; will not work for two-digit versions
-                    if (gccVersion >= WScript.Arguments(2)) {
-                        WScript.Echo("ok");
-                    } else {
-                        WScript.Echo("fail");
-                    }
-                }
-            }
-            return;
-        }
-    }
+		var tmpExec;
+		tmpExec = WshShell.Run("cmd /c echo int main(){return 0;} >detect.c", 0, true);
 
-    //Compile binary
-    tmpExec = WshShell.Exec("cl /MD detect.c /link /MAP");
-    while (tmpExec.Status == 0) {
-        WScript.Sleep(100);
-    }
-    //compiler banner that includes version and target arch was printed to stderr
-    var clVersion = tmpExec.StdErr.ReadAll();
+		// The next block deals with GCC (MinGW)
+		if ( WScript.Arguments.Count() > 1 && WScript.Arguments(1) == "gcc" ) {
+			if ( WScript.Arguments(0) == "/arch" ) {
+				// Get predefined macros
+				tmpExec = WshShell.Run("cmd /C gcc -dM -E detect.c > detect.map", 0, true);
+				var file = fso.OpenTextFile("detect.map", 1, 0);
+				var defs = file.readAll();
+				file.Close();
 
-    if (WScript.Arguments(0) == "/arch") {
-        //detect target architecture
-        var intel64 = /AMD64|EM64T|x64/mgi;
-        var ia32 = /[80|\s]x86/mgi;
-        var arm = /ARM/mgi;
-        if (clVersion.match(intel64)) {
-            WScript.Echo("intel64");
-        } else if (clVersion.match(ia32)) {
-            WScript.Echo("ia32");
-        } else if (clVersion.match(arm)) {
-            WScript.Echo("armv7");
-        } else {
-            WScript.Echo("unknown");
-        }
-        return;
-    }
+				//detect target architecture
+				var intel64=/x86_64|amd64/mgi;
+				var ia32=/i386/mgi;
+				if ( defs.match(intel64) ) {
+					WScript.Echo( "intel64" );
+				} else if ( defs.match(ia32) ) {
+					WScript.Echo( "ia32" );
+				} else {
+					WScript.Echo( "unknown" );
+				}
+			} else {
+				tmpExec = WshShell.Exec("gcc -dumpversion");
+				var gcc_version = tmpExec.StdOut.ReadLine();
+				if ( WScript.Arguments(0) == "/runtime" ) {
+					WScript.Echo( "mingw"+gcc_version );
+				}
+				else if ( WScript.Arguments(0) == "/minversion" ) {
+					// Comparing strings, not numbers; will not work for two-digit versions
+					if ( gcc_version >= WScript.Arguments(2) ) {
+						WScript.Echo( "ok" );
+					} else {
+						WScript.Echo( "fail" );
+					}
+				}
+			}
+			return;
+		}
 
-    if (WScript.Arguments(0) == "/runtime") {
-        //read map-file
-        var mapContext = readAllFromFile("detect.map");
-        //detect runtime
-        var vc71 = /MSVCR71\.DLL/mgi;
-        var vc80 = /MSVCR80\.DLL/mgi;
-        var vc90 = /MSVCR90\.DLL/mgi;
-        var vc100 = /MSVCR100\.DLL/mgi;
-        var vc110 = /MSVCR110\.DLL/mgi;
-        var vc120 = /MSVCR120\.DLL/mgi;
-        var vc140 = /VCRUNTIME140\.DLL/mgi;
-        var psdk = /MSVCRT\.DLL/mgi;
-        if (mapContext.match(vc71)) {
-            WScript.Echo("vc7.1");
-        } else if (mapContext.match(vc80)) {
-            WScript.Echo("vc8");
-        } else if (mapContext.match(vc90)) {
-            WScript.Echo("vc9");
-        } else if (mapContext.match(vc100)) {
-            WScript.Echo("vc10");
-        } else if (mapContext.match(vc110)) {
-            WScript.Echo("vc11");
-        } else if (mapContext.match(vc120)) {
-            WScript.Echo("vc12");
-        } else if (mapContext.match(vc140)) {
-            if (WshShell.ExpandEnvironmentStrings("%VisualStudioVersion%") == "15.0")
-                WScript.Echo("vc14.1");
-            else
-                WScript.Echo("vc14");
-        } else {
-            WScript.Echo("unknown");
-        }
-        return;
-    }
+		//Compile binary
+		tmpExec = WshShell.Exec("cl /MD detect.c /link /MAP");
+		while ( tmpExec.Status == 0 ) {
+			WScript.Sleep(100);
+		}
+		//compiler banner that includes version and target arch was printed to stderr
+		var clVersion = tmpExec.StdErr.ReadAll();
 
-    if (WScript.Arguments(0) == "/minversion") {
-        var compilerVersion;
-        var compilerUpdate;
-        if (WScript.Arguments(1) == "cl") {
-            compilerVersion = clVersion.match(/Compiler Version ([0-9.]+)\s/mi)[1];
-            // compilerVersion is in xx.xx.xxxxx.xx format, i.e. a string.
-            // It will compare well with major.minor versions where major has two digits,
-            // which is sufficient as the versions of interest start from 13 (for VC7).
-        } else if (WScript.Arguments(1) == "icl") {
-            // Get predefined ICL macros
-            tmpExec = WshShell.Run("cmd /C icl /QdM /E detect.c > detect.map", 0, true);
-            var defs = readAllFromFile("detect.map");
-            // In #define __INTEL_COMPILER XXYY, XX is the major ICL version, YY is minor
-            compilerVersion = defs.match(/__INTEL_COMPILER[ \t]*([0-9]+).*$/mi)[1] / 100;
-            compilerUpdate = defs.match(/__INTEL_COMPILER_UPDATE[ \t]*([0-9]+).*$/mi)[1];
-            // compiler version is a number; it compares well with another major.minor
-            // version number, where major has one, two, and perhaps more digits (9.1, 11, etc).
-        }
-        var requestedVersion = WScript.Arguments(2);
-        var requestedUpdate = 0;
-        if (WScript.Arguments.Count() > 3)
-            requestedUpdate = WScript.Arguments(3);
-        if (compilerVersion < requestedVersion) {
-            WScript.Echo("fail");
-        } else if (compilerVersion == requestedVersion && compilerUpdate < requestedUpdate) {
-            WScript.Echo("fail");
-        } else {
-            WScript.Echo("ok");
-        }
-        return;
-    }
+		if ( WScript.Arguments(0) == "/arch" ) {
+			//detect target architecture
+			var intel64=/AMD64|EM64T|x64/mgi;
+			var ia32=/[80|\s]x86/mgi;
+			var arm=/ARM/mgi;
+			if ( clVersion.match(intel64) ) {
+				WScript.Echo( "intel64" );
+			} else if ( clVersion.match(ia32) ) {
+				WScript.Echo( "ia32" );
+			} else if ( clVersion.match(arm) ) {
+				WScript.Echo( "armv7" );
+			} else {
+				WScript.Echo( "unknown" );
+			}
+			return;
+		}
+
+		if ( WScript.Arguments(0) == "/runtime" ) {
+			//read map-file
+			var map = fso.OpenTextFile("detect.map", 1, 0);
+			var mapContext = map.readAll();
+			map.Close();
+
+			//detect runtime
+			var vc71=/MSVCR71\.DLL/mgi;
+			var vc80=/MSVCR80\.DLL/mgi;
+			var vc90=/MSVCR90\.DLL/mgi;
+			var vc100=/MSVCR100\.DLL/mgi;
+			var vc110=/MSVCR110\.DLL/mgi;
+			var vc120=/MSVCR120\.DLL/mgi;
+			var vc140=/VCRUNTIME140\.DLL/mgi;
+			var psdk=/MSVCRT\.DLL/mgi;
+			if ( mapContext.match(vc71) ) {
+				WScript.Echo( "vc7.1" );
+			} else if ( mapContext.match(vc80) ) {
+				WScript.Echo( "vc8" );
+			} else if ( mapContext.match(vc90) ) {
+				WScript.Echo( "vc9" );
+			} else if ( mapContext.match(vc100) ) {
+				WScript.Echo( "vc10" );
+			} else if ( mapContext.match(vc110) ) {
+				WScript.Echo( "vc11" );
+			} else if ( mapContext.match(vc120) ) {
+				WScript.Echo( "vc12" );
+			} else if ( mapContext.match(vc140) ) {
+				WScript.Echo( "vc14" );
+			} else {
+				WScript.Echo( "unknown" );
+			}
+			return;
+		}
+
+		if ( WScript.Arguments(0) == "/minversion" ) {
+			var compiler_version;
+			if ( WScript.Arguments(1) == "cl" ) {
+				compiler_version = clVersion.match(/Compiler Version ([0-9.]+)\s/mi)[1];
+				// compiler_version is in xx.xx.xxxxx.xx format, i.e. a string.
+				// It will compare well with major.minor versions where major has two digits,
+				// which is sufficient as the versions of interest start from 13 (for VC7).
+			} else if ( WScript.Arguments(1) == "icl" ) {
+				// Get predefined ICL macros
+				tmpExec = WshShell.Run("cmd /C icl /QdM /E detect.c > detect.map", 0, true);
+				var file = fso.OpenTextFile("detect.map", 1, 0);
+				var defs = file.readAll();
+				file.Close();
+				// In #define __INTEL_COMPILER XXYY, XX is the major ICL version, YY is minor
+				compiler_version = defs.match(/__INTEL_COMPILER[ \t]*([0-9]+).*$/mi)[1]/100;
+				// compiler version is a number; it compares well with another major.minor
+				// version number, where major has one, two, and perhaps more digits (9.1, 11, etc).
+			}
+			if ( compiler_version >= WScript.Arguments(2) ) {
+				WScript.Echo( "ok" );
+			} else {
+				WScript.Echo( "fail" );
+			}
+			return;
+		}
 }
 
 function doClean() {
-    var fso = new ActiveXObject("Scripting.FileSystemObject");
-    // delete intermediate files
-    if (fso.FileExists("detect.c"))
-        fso.DeleteFile("detect.c", false);
-    if (fso.FileExists("detect.obj"))
-        fso.DeleteFile("detect.obj", false);
-    if (fso.FileExists("detect.map"))
-        fso.DeleteFile("detect.map", false);
-    if (fso.FileExists("detect.exe"))
-        fso.DeleteFile("detect.exe", false);
-    if (fso.FileExists("detect.exe.manifest"))
-        fso.DeleteFile("detect.exe.manifest", false);
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		// delete intermediate files
+		if ( fso.FileExists("detect.c") )
+			fso.DeleteFile ("detect.c", false);
+		if ( fso.FileExists("detect.obj") )
+			fso.DeleteFile ("detect.obj", false);
+		if ( fso.FileExists("detect.map") )
+			fso.DeleteFile ("detect.map", false);
+		if ( fso.FileExists("detect.exe") )
+			fso.DeleteFile ("detect.exe", false);
+		if ( fso.FileExists("detect.exe.manifest") )
+			fso.DeleteFile ("detect.exe.manifest", false);
 }
 
-if (WScript.Arguments.Count() > 0) {
-
-    try {
-        doWork();
-    } catch (error) {
-        WScript.Echo("unknown");
-    }
-    doClean();
+if ( WScript.Arguments.Count() > 0 ) {
+	
+	try {
+		doWork();
+	} catch( error ) {
+		WScript.Echo( "unknown" );
+	}
+	doClean();
 
 } else {
-    WScript.Echo("Supported options:\n"
-                  + "\t/arch [compiler]\n"
-                  + "\t/runtime [compiler]\n"
-                  + "\t/minversion compiler version");
+	WScript.Echo( "Supported options:\n"
+	              + "\t/arch [compiler]\n"
+	              + "\t/runtime [compiler]\n"
+	              + "\t/minversion compiler version" );
 }
 

build/generate_tbbvars.bat

@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) 2005-2017 Intel Corporation
+REM Copyright (c) 2005-2016 Intel Corporation
 REM
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ set bin_dir=%CD%
 set fslash_bin_dir=%bin_dir:\=/%
 set _INCLUDE=INCLUDE& set _LIB=LIB
 if not x%UNIXMODE%==x set _INCLUDE=CPATH& set _LIB=LIBRARY_PATH
-if not x%USE_INCLUDE_ENV%==x set _INCLUDE=INCLUDE
 
+if exist tbbvars.bat goto skipbat
 echo Generating local tbbvars.bat
 echo @echo off>tbbvars.bat
 echo SET TBBROOT=%actual_root%>>tbbvars.bat
@@ -36,7 +36,9 @@ echo SET %_INCLUDE%=%%TBBROOT%%\include;%%%_INCLUDE%%%>>tbbvars.bat
 echo SET %_LIB%=%bin_dir%;%%%_LIB%%%>>tbbvars.bat
 echo SET PATH=%bin_dir%;%%PATH%%>>tbbvars.bat
 if not x%UNIXMODE%==x echo SET LD_LIBRARY_PATH=%bin_dir%;%%LD_LIBRARY_PATH%%>>tbbvars.bat
+:skipbat
 
+if exist tbbvars.sh goto skipsh
 echo Generating local tbbvars.sh
 echo #!/bin/sh>tbbvars.sh
 echo export TBBROOT="%fslash_root%">>tbbvars.sh
@@ -46,7 +48,9 @@ echo export %_INCLUDE%="${TBBROOT}/include;$%_INCLUDE%">>tbbvars.sh
 echo export %_LIB%="%fslash_bin_dir%;$%_LIB%">>tbbvars.sh
 echo export PATH="%fslash_bin_dir%;$PATH">>tbbvars.sh
 if not x%UNIXMODE%==x echo export LD_LIBRARY_PATH="%fslash_bin_dir%;$LD_LIBRARY_PATH">>tbbvars.sh
+:skipsh
 
+if exist tbbvars.csh goto skipcsh
 echo Generating local tbbvars.csh
 echo #!/bin/csh>tbbvars.csh
 echo setenv TBBROOT "%actual_root%">>tbbvars.csh
@@ -56,6 +60,7 @@ echo setenv %_INCLUDE% "${TBBROOT}\include;$%_INCLUDE%">>tbbvars.csh
 echo setenv %_LIB% "%bin_dir%;$%_LIB%">>tbbvars.csh
 echo setenv PATH "%bin_dir%;$PATH">>tbbvars.csh
 if not x%UNIXMODE%==x echo setenv LD_LIBRARY_PATH "%bin_dir%;$LD_LIBRARY_PATH">>tbbvars.csh
+:skipcsh
 
 if not x%LIB_STL_ANDROID%==x (
 REM Workaround for copying Android* specific stl shared library to work folder

build/generate_tbbvars.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ bin_dir="$PWD"  #
 cd "$tbb_root"  # keep this comments here
 tbb_root="$PWD" # to make it unsensible
 cd "$bin_dir"   # to EOL encoding
-cat >./tbbvars.sh <<EOF
+[ -f ./tbbvars.sh ] || cat >./tbbvars.sh <<EOF
 #!/bin/bash
 export TBBROOT="${tbb_root}" #
 tbb_bin="${bin_dir}" #
@@ -44,7 +44,7 @@ else #
 fi #
 ${TBB_CUSTOM_VARS_SH} #
 EOF
-cat >./tbbvars.csh <<EOF
+[ -f ./tbbvars.csh ] || cat >./tbbvars.csh <<EOF
 #!/bin/csh
 setenv TBBROOT "${tbb_root}" #
 setenv tbb_bin "${bin_dir}" #

build/index.html

@@ -28,7 +28,7 @@ The files here are not intended to be used directly.  See below for usage.
 <DT>&lt;os&gt;.&lt;compiler&gt;.inc
 <DD>Compiler-specific Makefile for a particular &lt;os&gt; / &lt;compiler&gt; combination.
 <DT>*.sh
-<DD>Infrastructure utilities for Linux* OS, macOS*, and UNIX*-related operating systems.
+<DD>Infrastructure utilities for Linux* OS, OS X*, and UNIX*-related operating systems.
 <DT>*.js, *.bat
 <DD>Infrastructure utilities for Windows* OS.
 </DL>
@@ -41,9 +41,9 @@ To port Intel TBB to a new platform, operating system or architecture, see the <
 <H3>Software prerequisites:</H3>
 <OL>
 <LI>C++ compiler for the platform, operating system and architecture of interest.
-    Either the native compiler for your system, or, optionally, the appropriate Intel&reg; C++ Compiler, may be used.
+    Either the native compiler for your system, or, optionally, the appropriate Intel&reg; C++ compiler, may be used.
 <LI>GNU make utility. On Windows OS, if a UNIX* emulator is used to run GNU make,
-    it should be able to run Windows OS utilities and commands. On Linux OS, macOS, etc.,
+    it should be able to run Windows OS utilities and commands. On Linux OS, OS X, etc.,
     shell commands issued by GNU make should execute in a Bourne or BASH compatible shell.
     In the following examples, replace <TT>make</TT> with the correct GNU make command for
     your system (for example, <TT>gmake</TT>). GNU make version 3.80 and more recent are supported.
@@ -53,22 +53,22 @@ To port Intel TBB to a new platform, operating system or architecture, see the <
 Intel TBB libraries can be built by performing the following steps.
 On systems that support only one ABI (e.g., 32-bit), these steps build the libraries for that ABI.
 On systems that support both 64-bit and 32-bit libraries, these steps build the 64-bit libraries
-(Linux OS, macOS, and related systems) or whichever ABI is selected in the development environment (Windows OS).
+(Linux OS, OS X, and related systems) or whichever ABI is selected in the development environment (Windows OS).
 </P>
 <OL>
 <LI>Change to the <A HREF="../index.html">top-level directory</A> of the installed software.
-<LI>If using the Intel&reg; C++ Compiler, make sure the appropriate compiler is available in your PATH
+<LI>If using the Intel&reg; C++ compiler, make sure the appropriate compiler is available in your PATH
     (e.g., by sourcing the appropriate iccvars script for the compiler to be used).
 <LI>Invoke GNU make using no arguments, for example, <TT>make</TT>.
 </OL>
 
 <P>
-To build Intel TBB libraries for other than the default ABI (e.g., to build 32-bit libraries on Linux OS, macOS,
+To build Intel TBB libraries for other than the default ABI (e.g., to build 32-bit libraries on Linux OS, OS X,
 or related systems that support both 64-bit and 32-bit libraries), perform the following steps:
 </P>
 <OL>
 <LI>Change to the <A HREF="../index.html">top-level directory</A> of the installed software.
-<LI>If using the Intel&reg; C++ Compiler, make sure the appropriate compiler is available in your PATH
+<LI>If using the Intel&reg; C++ compiler, make sure the appropriate compiler is available in your PATH
     (e.g., by sourcing the appropriate iccvars script for the compiler to be used).
 <LI>Explicitly specify the architecture when invoking GNU make, e.g. <TT>make arch=ia32</TT>.
 </OL>
@@ -88,7 +88,7 @@ See also the list of other targets below.
 By default, the libraries will be built in sub-directories within the build/ directory.
 The sub-directories are named according to the operating system, architecture, compiler and software environment used
 (the sub-directory names also distinguish release vs. debug libraries).  On Linux OS, the software environment comprises
-the GCC, libc and kernel version used.  On macOS, the software environment comprises the GCC and OS version used.
+the GCC, libc and kernel version used.  On OS X, the software environment comprises the GCC and OS version used.
 On Windows OS, the software environment comprises the Microsoft* Visual Studio* version used.
 See below for how to change the default build directory.
 </P>
@@ -98,7 +98,7 @@ To perform different build and/or test operations, use the following steps.
 </P>
 <OL>
 <LI>Change to the <A HREF="../index.html">top-level directory</A> of the installed software.
-<LI>If using the Intel&reg; C++ Compiler, make sure the appropriate compiler is available in your PATH
+<LI>If using the Intel&reg; C++ compiler, make sure the appropriate compiler is available in your PATH
     (e.g., by sourcing the appropriate iccvars script for the compiler to be used).
 <LI>Invoke GNU make by using one or more of the following commands.
     <DL>
@@ -124,7 +124,7 @@ To perform different build and/or test operations, use the following steps.
     <DT><TT>make compiler=<B>{</B>icl, icc, gcc, clang<B>}</B> <B>[</B>(above options or targets)<B>]</B></TT>
     <DD>Build and run as above, but use specified compilers instead of default, native compilers
     <ol>
-        <li><tt><b> {</b>icl, icc<b>}</b> </tt> - to use Intel&reg; compilers (<tt>icl</tt> on Windows OS,  <tt>icc</tt>  on Linux OS or macOS). </li>
+        <li><tt><b> {</b>icl, icc<b>}</b> </tt> - to use Intel&reg; compilers (<tt>icl</tt> on Windows OS,  <tt>icc</tt>  on Linux OS or OS X). </li>
         <li><tt>gcc</tt>  - to use g++ (e.g. MinGW on Windows OS)</li>
         <li><tt>clang</tt> - to use Clang compiler</li>
     </ol>
@@ -134,9 +134,9 @@ To perform different build and/or test operations, use the following steps.
     <DD>Build and run as above, but additionally specify the version of the C++ standard or dialect to be used by
       the compiler. The specified value of <TT>stdver</TT> will be used as a parameter to the appropriate
       compiler option (such as <TT>-std</TT>); the behavior in case of unsupported value is compiler-specific.
-    <DT><TT>make target_app=<B>{</B>win8ui, uwp<B>}</B> [target_mode=store] <B>[</B>(above options or targets)<B>]</B></TT>
-    <DD>Build and run as above, but use API that is compliant with Universal Windows* applications. Use <TT>win8ui</TT> option, if you want to use Intel TBB in Windows* 8 Universal application and <TT>uwp</TT> in case of Windows* 10 Universal Windows application.
-    <TT>target_mode=store</TT> is used to produce binaries that are compliant with Windows Store* application container. In later case they won't work with Intel TBB unit tests but work only with Windows Store* applications.
+    <DT><TT>make target_ui=win8ui [target_ui_mode=production] <B>[</B>(above options or targets)<B>]</B></TT>
+    <DD>Build and run as above, but use API that is compliant with Windows Store* applications. 
+    <TT>target_ui_mode=production</TT> is used to produce binaries that are compliant with Windows Store* application container. In later case they won't with Intel TBB unit tests but work only with Windows Store* applications. 
     <DT><TT>ndk-build target=android <B>[</B>(above options or targets)<B>]</B></TT>
     <DD>Build and run as above, but build libraries for Android* OS by Android NDK that should be installed. Makefiles were tested with revision 8.
     <DT><TT>make arch=<B>{</B>ia32, intel64, ia64<B>}</B> <B>[</B>(above options or targets)<B>]</B></TT>
@@ -233,7 +233,7 @@ See the Makefile infrastructure files for examples.
 <HR>
 <A HREF="../index.html">Up to parent directory</A>
 <P></P>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <P></P>
 Intel, the Intel logo and Itanium are trademarks of Intel Corporation or its subsidiaries in the U.S. and/or other countries.
 <p></p>

build/ios.clang.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/ios.macos.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/linux.clang.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/linux.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/linux.icc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,20 +29,17 @@ DYLIB_KEY = -shared
 EXPORT_KEY = -Wl,--version-script,
 NOINTRINSIC_KEY = -fno-builtin
 LIBDL = -ldl
-ifneq (,$(shell icc -dumpversion | egrep "1[2-9]\."))
-SDL_FLAGS = -fstack-protector -Wformat -Wformat-security
-endif
-
+SDL_FLAGS += -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
 CPLUS = icpc
 CONLY = icc
 
 ITT_NOTIFY = -DDO_ITT_NOTIFY
 ifeq (release,$(cfg))
-SDL_FLAGS += -D_FORTIFY_SOURCE=2
 CPLUS_FLAGS = $(ITT_NOTIFY) -O2 -g -DUSE_PTHREAD
 else
 CPLUS_FLAGS = $(ITT_NOTIFY) -O0 -g -DUSE_PTHREAD -DTBB_USE_DEBUG
 endif
+CPLUS_FLAGS += $(SDL_FLAGS)
 
 LIB_LINK_FLAGS = -shared -static-intel -Wl,-soname=$(BUILDING_LIBRARY) -z relro -z now
 LIBS += -lpthread -lrt
@@ -81,7 +78,7 @@ endif
 
 ifneq (,$(codecov))
 # no tool support for code coverage, need profile data generation
-    ITT_NOTIFY = -prof-gen=srcpos
+    ITT_NOTIFY = -prof-genx
 endif
 
 #------------------------------------------------------------------------------

build/linux.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ SONAME_SUFFIX =$(shell grep TBB_COMPATIBLE_INTERFACE_VERSION $(tbb_root)/include
 ifeq ($(arch),ia64)
         def_prefix = lin64ipf
 endif
-ifneq (,$(findstring $(arch),sparc s390x))
+ifeq ($(arch),sparc)
         def_prefix = lin64
 endif
 ifeq ($(arch),armv7)

build/linux.pathcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/linux.xl.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/macos.clang.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/macos.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/macos.icc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,10 +27,7 @@ OUTPUTOBJ_KEY = -o #
 PIC_KEY = -fPIC
 WARNING_AS_ERROR_KEY = -Werror
 WARNING_KEY = -w1
-ifneq (,$(shell icc -dumpversion | egrep "1[2-9]\."))
-SDL_FLAGS = -fstack-protector -Wformat -Wformat-security
-endif
-
+SDL_FLAGS=-fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
 DYLIB_KEY = -dynamiclib
 EXPORT_KEY = -Wl,-exported_symbols_list,
 LIBDL = -ldl
@@ -52,24 +49,25 @@ ifneq (,$(shell icc -dumpversion | egrep  "^1[2-9]\."))
 endif
 
 ifeq ($(cfg), release)
-    SDL_FLAGS += -D_FORTIFY_SOURCE=2
     CPLUS_FLAGS = -g -O2 -fno-omit-frame-pointer
 else
     CPLUS_FLAGS = -g -O0 -DTBB_USE_DEBUG
 endif
 
+CPLUS_FLAGS += $(SDL_FLAGS)
 CPLUS_FLAGS += -DUSE_PTHREAD
 
 ifneq (,$(codecov))
-    CPLUS_FLAGS += -prof-gen=srcpos
+    CPLUS_FLAGS += -prof-genx
 endif
 
 # ICC 14.0 and higher support usage of libc++, clang standard library
-MACOSX_DEPLOYMENT_TARGET ?= 10.11
+# Extending minimal deployment version of official binaries to unsupported 10.8
+# per customer requests. TODO: make a dedicated variable for this
 ifneq (,$(shell icc -dumpversion | egrep  "^1[4-9]\."))
 ifneq (,$(stdlib))
-    CPLUS_FLAGS    += -stdlib=$(stdlib) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
-    LIB_LINK_FLAGS += -stdlib=$(stdlib) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+    CPLUS_FLAGS    += -stdlib=$(stdlib) -mmacosx-version-min=10.8
+    LIB_LINK_FLAGS += -stdlib=$(stdlib) -mmacosx-version-min=10.8
 endif
 endif
 

build/macos.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/mic.icc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,19 +29,18 @@ DYLIB_KEY = -shared -Wl,-soname=$@
 EXPORT_KEY = -Wl,--version-script,
 NOINTRINSIC_KEY = -fno-builtin
 LIBDL = -ldl
-SDL_FLAGS = -fstack-protector -Wformat -Wformat-security
+
 CPLUS = icpc
 CONLY = icc
 
 ifeq (release,$(cfg))
-    SDL_FLAGS += -D_FORTIFY_SOURCE=2
     CPLUS_FLAGS = -O2 -g -DUSE_PTHREAD
 else
     CPLUS_FLAGS = -O0 -g -DUSE_PTHREAD -DTBB_USE_DEBUG
 endif
 
 ifneq (,$(codecov))
-    CPLUS_FLAGS += -prof-gen=srcpos
+    CPLUS_FLAGS += -prof-genx
 endif
 
 ifneq (,$(shell icc -dumpversion | egrep  "^1[6-9]\."))
@@ -50,7 +49,7 @@ else
 OPENMP_FLAG = -openmp
 endif
 
-LIB_LINK_FLAGS = -shared -static-intel -Wl,-soname=$(BUILDING_LIBRARY) -z relro -z now
+LIB_LINK_FLAGS = -shared -static-intel -Wl,-soname=$(BUILDING_LIBRARY)
 LIBS += -lpthread -lrt
 C_FLAGS = $(CPLUS_FLAGS)
 CILK_AVAILABLE = yes

build/mic.linux.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/mic.linux.launcher.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/mic.offload.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test_launcher.bat

@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) 2005-2017 Intel Corporation
+REM Copyright (c) 2005-2016 Intel Corporation
 REM
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.

build/test_launcher.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/version_info_aix.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/version_info_android.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/version_info_linux.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/version_info_macos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/version_info_sunos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/version_info_windows.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2017 Intel Corporation
+// Copyright (c) 2005-2016 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -93,3 +93,42 @@ WScript.echo( "#define __TBB_DATETIME \"" + date.toUTCString() + "\"" );
 WScript.echo( "#define __TBB_VERSION_YMD " + date.getUTCFullYear() + ", " + 
               (date.getUTCMonth() > 8 ? (date.getUTCMonth()+1):("0"+(date.getUTCMonth()+1))) + 
               (date.getUTCDate() > 9 ? date.getUTCDate():("0"+date.getUTCDate())) );
+
+
+/*
+
+Original strings
+
+#define __TBB_VERSION_STRINGS \
+"TBB: BUILD_HOST\t\tvpolin-mobl1 (ia32)" ENDL \
+"TBB: BUILD_OS\t\tMicrosoft Windows XP [Version 5.1.2600]" ENDL \
+"TBB: BUILD_CL\t\tMicrosoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86" ENDL \
+"TBB: BUILD_COMPILER\tIntel(R) C++ Compiler for 32-bit applications, Version 9.1 Build 20070109Z Package ID: W_CC_C_9.1.034 " ENDL \
+"TBB: BUILD_TARGET\t" ENDL \
+"TBB: BUILD_COMMAND\t" ENDL \
+
+#define __TBB_DATETIME "Mon Jun 4 10:16:07 UTC 2007"
+#define __TBB_VERSION_YMD 2007, 0604
+
+
+
+# The script must be run from two directory levels below this level.
+x='"TBB: '
+y='" ENDL \'
+echo "#define __TBB_VERSION_STRINGS \\"
+echo $x "BUILD_HOST\t\t"`hostname`" ("`../../arch.exe`")"$y
+echo $x "BUILD_OS\t\t"`../../win_version.bat|grep -i 'Version'`$y
+echo >empty.cpp
+echo $x "BUILD_CL\t\t"`cl -c empty.cpp 2>&1 | grep -i Version`$y
+echo $x "BUILD_COMPILER\t"`icl -c empty.cpp 2>&1 | grep -i Version`$y
+echo $x "BUILD_TARGET\t"$TBB_ARCH$y
+echo $x "BUILD_COMMAND\t"$*$y
+echo ""
+# A workaround for MKS 8.6 where `date -u` crashes.
+date -u > date.tmp
+echo "#define __TBB_DATETIME \""`cat date.tmp`"\""
+echo "#define __TBB_VERSION_YMD "`date '+%Y, %m%d'`
+rm empty.cpp
+rm empty.obj
+rm date.tmp
+*/

build/vs2012/index.html

@@ -2,7 +2,7 @@
 <BODY>
 
 <H2>Overview</H2>
-This directory contains the Visual Studio* 2013 solution to build Intel&reg; Threading Building Blocks.
+This directory contains the Visual Studio* 2012 solution to build Intel&reg; Threading Building Blocks.
 
 
 <H2>Files</H2>
@@ -20,10 +20,10 @@ This directory contains the Visual Studio* 2013 solution to build Intel&reg; Thr
 <HR>
 <A HREF="../index.html">Up to parent directory</A>
 <P></P>
-Copyright &copy; 2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2016 Intel Corporation.  All Rights Reserved.
 <P></P>
-Intel and the Intel logo are trademarks of Intel Corporation
-or its subsidiaries in the U.S. and/or other countries.
+Intel is a registered trademark or trademark of Intel Corporation
+or its subsidiaries in the United States and other countries.
 <p></p>
 * Other names and brands may be claimed as the property of others.
 </BODY>

build/vs2012/makefile.sln

@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8898CE0B-0BFB-45AE-AA71-83735ED2510D}"
 	ProjectSection(SolutionItems) = preProject
 		index.html = index.html

build/vs2012/tbb.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug-MT|Win32">
       <Configuration>Debug-MT</Configuration>
@@ -44,45 +44,45 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MT|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-MT|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MT|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

build/vs2012/tbbmalloc.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug-MT|Win32">
       <Configuration>Debug-MT</Configuration>
@@ -44,45 +44,45 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MT|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-MT|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MT|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

build/vs2012/tbbmalloc_proxy.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug-MT|Win32">
       <Configuration>Debug-MT</Configuration>
@@ -44,45 +44,45 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MT|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-MT|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MT|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

build/windows.cl.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,19 +29,19 @@ LINK_FLAGS = /link /nologo
 LIB_LINK_FLAGS=/link /nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DYNAMICBASE /NXCOMPAT
 
 ifneq (,$(stdver))
-    CXX_STD_FLAGS = /std:$(stdver)
+    CXX_STD_FLAGS = /std:$(stdver) /D_TBB_CPP0X
 endif
 
 ifeq ($(arch), ia32)
-    LIB_LINK_FLAGS += /SAFESEH
+	LIB_LINK_FLAGS += /SAFESEH
 endif
 
 ifeq ($(runtime), vc_mt)
-    MS_CRT_KEY = /MT$(if $(findstring debug,$(cfg)),d)
+	MS_CRT_KEY = /MT$(if $(findstring debug,$(cfg)),d)
 else
-    MS_CRT_KEY = /MD$(if $(findstring debug,$(cfg)),d)
+	MS_CRT_KEY = /MD$(if $(findstring debug,$(cfg)),d)
 endif
-EH_FLAGS = $(if $(no_exceptions),/EHs-,/EHsc /GR)
+EH_FLAGS = /EHsc /GR
 
 ifeq ($(cfg), release)
         CPLUS_FLAGS = $(MS_CRT_KEY) /O2 /Zi $(EH_FLAGS) /Zc:forScope /Zc:wchar_t /D__TBB_LIB_NAME=$(TBB.LIB)
@@ -52,22 +52,15 @@ ifeq ($(cfg), debug)
         ASM_FLAGS = /DUSE_FRAME_POINTER
 endif
 
-ZW_KEY = /ZW:nostdlib
-
-ifneq (,$(filter win8ui,$(target_app) $(target_ui)))
-        CPLUS_FLAGS += $(ZW_KEY) /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP"
-        _WIN32_WINNT = 0x0602
-else ifneq (,$(filter uwp,$(target_app) $(target_ui)))
-        CPLUS_FLAGS += $(ZW_KEY) /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP"
-        _WIN32_WINNT = 0x0A00
-        LIB_LINK_FLAGS += /NODEFAULTLIB:kernel32.lib OneCore.lib
+ifeq ($(target_ui), win8ui)
+        CPLUS_FLAGS += /D "_UNICODE" /D "UNICODE"  /D "WINAPI_FAMILY=WINAPI_FAMILY_APP"
+        _WIN32_WINNT=0x0602
+ifeq ($(target_ui_mode), production)
+        LIB_LINK_FLAGS += /APPCONTAINER
+endif
 else
         CPLUS_FLAGS += /DDO_ITT_NOTIFY
 endif
-ifneq (,$(filter store,$(target_mode) $(target_ui_mode)))
-#       it is necessary to source vcvars with 'store' argument in production
-        LIB_LINK_FLAGS += /APPCONTAINER
-endif
 
 CPLUS_FLAGS += /GS
 
@@ -78,8 +71,6 @@ DEFINE_KEY = /D
 OUTPUT_KEY = /Fe
 OUTPUTOBJ_KEY = /Fo
 WARNING_AS_ERROR_KEY = /WX
-WARNING_SUPPRESS = $(if $(no_exceptions),/wd4530 /wd4577)
-BIGOBJ_KEY = /bigobj
 
 ifeq ($(runtime),vc7.1)
         WARNING_KEY = /W3
@@ -93,8 +84,6 @@ EXPORT_KEY = /DEF:
 NODEFAULTLIB_KEY = /Zl
 NOINTRINSIC_KEY = /Oi-
 
-INCLUDE_TEST_HEADERS = /FI$(tbb_root)/src/test/harness_preload.h
-
 ifeq ($(runtime),vc8)
         WARNING_KEY += /Wp64
         CPLUS_FLAGS += /D_USE_RTM_VERSION
@@ -114,7 +103,7 @@ endif
 
 CPLUS_FLAGS += /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE \
         /D_WIN32_WINNT=$(_WIN32_WINNT)
-C_FLAGS = $(subst $(ZW_KEY),,$(subst $(EH_FLAGS),,$(CPLUS_FLAGS)))
+C_FLAGS = $(subst $(EH_FLAGS),,$(CPLUS_FLAGS))
 
 #------------------------------------------------------------------------------
 # End of setting compiler flags.

build/windows.gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,7 +65,6 @@ DYLIB_KEY = -shared
 LIBDL =
 EXPORT_KEY = -Wl,--version-script,
 LIBS = -lpsapi
-BIGOBJ_KEY = -Wa,-mbig-obj
 
 #------------------------------------------------------------------------------
 # End of compiler-specific variables
@@ -81,13 +80,6 @@ ifeq (ok,$(call detect_js,/minversion gcc 4.8))
     RTM_KEY = -mrtm
 endif
 
-# gcc 6.0 and later have -flifetime-dse option that controls
-# elimination of stores done outside the object lifetime
-ifeq (ok,$(call detect_js,/minversion gcc 6.0))
-    # keep pre-contruction stores for zero initialization
-    DSE_KEY = -flifetime-dse=1
-endif
-
 ifeq ($(cfg), release)
         CPLUS_FLAGS = -g -O2
 endif

build/windows.icl.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ LINK_FLAGS = /link /nologo
 LIB_LINK_FLAGS= /link /nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DYNAMICBASE /NXCOMPAT
 
 ifeq ($(arch), ia32)
-    LIB_LINK_FLAGS += /SAFESEH
+	LIB_LINK_FLAGS += /SAFESEH
 endif
 
 ifneq (,$(stdver))
-    CXX_STD_FLAGS = /Qstd=$(stdver)
+    CXX_STD_FLAGS = /Qstd=$(stdver) /D_TBB_CPP0X
 endif
 
 # ICC 12.0 and higher provide Intel(R) Cilk(TM) Plus
@@ -50,17 +50,12 @@ ifeq (ok,$(call detect_js,/minversion icl 12))
     CILK_AVAILABLE = yes
 endif
 
-# ICC 17.0.4 and higher provide support for VS2017
-ifeq (ok,$(call detect_js,/minversion icl 17 4))
-    VS2017_SUPPORT = yes
-endif
-
 ifeq ($(runtime), vc_mt)
     MS_CRT_KEY = /MT$(if $(findstring debug,$(cfg)),d)
 else
     MS_CRT_KEY = /MD$(if $(findstring debug,$(cfg)),d)
 endif
-EH_FLAGS = $(if $(no_exceptions),/EHs-,/EHsc /GR)
+EH_FLAGS = /EHsc /GR
 
 ifeq ($(cfg), release)
     CPLUS_FLAGS = $(MS_CRT_KEY) /O2 /Zi $(EH_FLAGS) /Zc:forScope /Zc:wchar_t /D__TBB_LIB_NAME=$(TBB.LIB)
@@ -82,13 +77,10 @@ OUTPUT_KEY = /Fe
 OUTPUTOBJ_KEY = /Fo
 WARNING_AS_ERROR_KEY = /WX
 WARNING_KEY = /W3
-WARNING_SUPPRESS = $(if $(no_exceptions),/wd583)
 DYLIB_KEY = /DLL
 EXPORT_KEY = /DEF:
 NODEFAULTLIB_KEY = /Zl
 NOINTRINSIC_KEY = /Oi-
-BIGOBJ_KEY = /bigobj
-INCLUDE_TEST_HEADERS = /FI$(tbb_root)/src/test/harness_preload.h
 
 
 ifneq (,$(codecov))
@@ -129,12 +121,7 @@ ifeq ($(VCCOMPAT_FLAG),)
         VCCOMPAT_FLAG := $(if $(findstring vc12, $(VCVERSION)),/Qvc12)
 endif
 ifeq ($(VCCOMPAT_FLAG),)
-    VCCOMPAT_FLAG := $(if $(findstring vc14, $(VCVERSION)),/Qvc14)
-    ifeq ($(VS2017_SUPPORT),yes)
-        ifneq (,$(findstring vc14.1, $(VCVERSION)))
-            VCCOMPAT_FLAG := /Qvc14.1
-        endif
-    endif
+        VCCOMPAT_FLAG := $(if $(findstring vc14, $(VCVERSION)),/Qvc14)
 endif
 ifeq ($(VCCOMPAT_FLAG),)
         $(error VC version not detected correctly: $(VCVERSION) )

build/windows.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2017 Intel Corporation
+# Copyright (c) 2005-2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/xbox360.cl.inc

@@ -0,0 +1,85 @@
+# Copyright (c) 2005-2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+#
+#
+
+#------------------------------------------------------------------------------
+# Define compiler-specific variables.
+#------------------------------------------------------------------------------
+
+
+#------------------------------------------------------------------------------
+# Setting compiler flags.
+#------------------------------------------------------------------------------
+CPLUS = cl /nologo
+LINK_FLAGS = /link /nologo
+LIB_LINK_FLAGS=/link /nologo /DLL /MAP /DEBUG
+MS_CRT_KEY = /MT$(if $(findstring debug,$(cfg)),d)
+EH_FLAGS = /EHsc /GR
+               
+ifeq ($(cfg), release)
+        CPLUS_FLAGS = $(MS_CRT_KEY) /O2 /Zi $(EH_FLAGS) /Zc:forScope /D_XBOX /DTBB_NO_LEGACY=1
+        ASM_FLAGS =
+endif
+ifeq ($(cfg), debug)
+        CPLUS_FLAGS = $(MS_CRT_KEY) /Od /Ob0 /Zi $(EH_FLAGS) /Zc:forScope \
+                      /DTBB_USE_DEBUG /D_XBOX /DTBB_NO_LEGACY=1
+        ASM_FLAGS = /DUSE_FRAME_POINTER
+endif
+
+
+COMPILE_ONLY = /c
+PREPROC_ONLY = /TP /EP
+INCLUDE_KEY = /I
+DEFINE_KEY = /D
+OUTPUT_KEY = /Fe
+OUTPUTOBJ_KEY = /Fo
+WARNING_AS_ERROR_KEY = /WX
+WARNING_KEY = /W3
+DYLIB_KEY = /DLL
+EXPORT_KEY = /DEF:
+
+ifeq (em64t,$(arch))
+        CPLUS_FLAGS += /GS-
+endif
+
+CPLUS_FLAGS += /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=$(_WIN32_WINNT)
+C_FLAGS = $(CPLUS_FLAGS) /TC
+#------------------------------------------------------------------------------
+# End of setting compiler flags.
+#------------------------------------------------------------------------------
+
+
+#------------------------------------------------------------------------------
+# Setting assembler data.
+#------------------------------------------------------------------------------
+# nothing for XBOX360
+#------------------------------------------------------------------------------
+# End of setting assembler data.
+#------------------------------------------------------------------------------
+
+
+#------------------------------------------------------------------------------
+# Setting tbbmalloc data.
+#------------------------------------------------------------------------------
+M_CPLUS_FLAGS = $(subst $(EH_FLAGS),/EHs-,$(CPLUS_FLAGS))
+#------------------------------------------------------------------------------
+# End of setting tbbmalloc data.
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# End of define compiler-specific variables.
+#------------------------------------------------------------------------------

build/xbox360.inc

@@ -0,0 +1,72 @@
+# Copyright (c) 2005-2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+#
+#
+
+ifdef tbb_build_dir
+  test_dir:=$(tbb_build_dir)
+else
+  test_dir:=.
+endif
+
+# TODO give an error if archs doesn't match
+ifndef arch
+  export arch:=xbox360
+endif
+
+ifndef runtime
+  export runtime:=xdk
+endif
+
+native_compiler := cl
+export compiler ?= cl
+debugger ?= devenv /debugexe
+
+CMD=cmd /C
+CWD=$(shell cmd /C echo %CD%)
+RM=cmd /C del /Q /F
+RD=cmd /C rmdir
+MD=cmd /c mkdir
+SLASH=\\
+NUL = nul
+
+OBJ = obj
+DLL = dll
+LIBEXT = lib
+
+def_prefix = $(arch)
+
+# Target Windows version. Do not increase beyond 0x0500 without prior discussion!
+# Used as the value for macro definition option in compiler specific inc files.
+_WIN32_WINNT=0x0400
+
+TBB.LST =
+TBB.DEF = $(tbb_root)/src/tbb/$(def_prefix)-tbb-export.def
+TBB.DLL = tbb$(CPF_SUFFIX)$(DEBUG_SUFFIX).$(DLL)
+TBB.LIB = tbb$(CPF_SUFFIX)$(DEBUG_SUFFIX).$(LIBEXT)
+TBB.RES =
+#On Windows we specify appropriate tbb library using #pragma comment
+LINK_TBB.LIB =
+
+MALLOC.DEF = $(MALLOC_ROOT)/$(def_prefix)-tbbmalloc-export.def
+MALLOC.DLL = tbbmalloc$(DEBUG_SUFFIX).$(DLL)
+MALLOC.LIB = tbbmalloc$(DEBUG_SUFFIX).$(LIBEXT)
+#On Windows we specify appropriate tbbmalloc library using #pragma comment
+LINK_MALLOC.LIB =
+MALLOC.RES =
+
+MAKE_VERSIONS = cmd /C cscript /nologo /E:jscript $(subst \,/,$(tbb_root))/build/version_info_windows.js $(compiler) $(arch) $(subst \,/,"$(VERSION_FLAGS)") > version_string.ver
+MAKE_TBBVARS  = cmd /C "$(subst /,\,$(tbb_root))\build\generate_tbbvars.bat"

cmake/README.rst

@@ -1,285 +0,0 @@
-.. contents::
-
-Introduction
-------------
-Many developers use CMake to manage their development projects, so the Intel(R) Threading Building Blocks (Intel(R) TBB)
-team created the set of CMake modules to simplify integration of the Intel TBB library into a CMake project.
-The modules are available starting from Intel TBB 2017 U7 in `<tbb_root>/cmake <https://github.com/01org/tbb/tree/tbb_2017/cmake>`_.
-
-About Intel TBB
-^^^^^^^^^^^^^^^
-Intel TBB is a library that supports scalable parallel programming using standard ISO C++ code. It does not require special languages or compilers. It is designed to promote scalable data parallel programming. Additionally, it fully supports nested parallelism, so you can build larger parallel components from smaller parallel components. To use the library, you specify tasks, not threads, and let the library map tasks onto threads in an efficient manner.
-
-Many of the library interfaces employ generic programming, in which interfaces are defined by requirements on types and not specific types. The C++ Standard Template Library (STL) is an example of generic programming. Generic programming enables Intel TBB to be flexible yet efficient. The generic interfaces enable you to customize components to your specific needs.
-
-The net result is that Intel TBB enables you to specify parallelism far more conveniently than using raw threads, and at the same time can improve performance.
-
-References
-^^^^^^^^^^
-* `Official Intel TBB open source site <https://www.threadingbuildingblocks.org/>`_
-* `Official GitHub repository <https://github.com/01org/tbb>`_
-
-Engineering team contacts
-^^^^^^^^^^^^^^^^^^^^^^^^^
-The Intel TBB team is very interested in convenient integration of the Intel TBB library into customer projects. These CMake modules were created to provide such a possibility for CMake projects using a simple but powerful interface. We hope you will try these modules and we are looking forward to receiving your feedback!
-
-E-mail us: `inteltbbdevelopers@intel.com <mailto:inteltbbdevelopers@intel.com>`_.
-
-Visit our `forum <https://software.intel.com/en-us/forums/intel-threading-building-blocks/>`_.
-
-Release Notes
--------------
-* Minimum supported CMake version: ``3.0.0``.
-* Intel TBB versioning via `find_package <https://cmake.org/cmake/help/latest/command/find_package.html>`_ has restricted functionality: compatibility of update numbers (as well as interface versions) is not checked. Supported versioning: ``find_package(TBB <major>.<minor> ...)``. Intel TBB interface version can be obtained in the customer project via the ``TBB_INTERFACE_VERSION`` variable.
-
-Use cases of Intel TBB integration into CMake-aware projects
-------------------------------------------------------------
-There are two types of Intel TBB packages:
- * Binary packages with pre-built binaries for Windows* OS, Linux* OS and macOS*. They are available on the releases page of the Github repository: https://github.com/01org/tbb/releases. The main purpose of the binary package integration is the ability to build Intel TBB header files and binaries into your CMake-aware project.
- * A source package is also available to download from the release page via the "Source code" link. In addition, it can be cloned from the repository by ``git clone https://github.com/01org/tbb.git``. The main purpose of the source package integration is to allow you to do a custom build of the Intel TBB library from the source files and then build that into your CMake-aware project.
-
-There are four types of CMake modules that can be used to integrate Intel TBB: `TBBConfig`, `TBBGet`, `TBBMakeConfig` and `TBBBuild`. See `Technical documentation for CMake modules`_ section for additional details.
-
-Binary package integration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following use case is valid for packages starting from Intel TBB 2017 U7:
-
-* Download package manually and make integration.
-
- Pre-condition: Location of TBBConfig.cmake is available via ``TBB_DIR`` or ``CMAKE_PREFIX_PATH`` contains path to Intel TBB root.
-
- CMake code for integration:
-
-  .. code:: cmake
-
-   find_package(TBB <options>)
-
-The following use case is valid for all Intel TBB 2017 packages.
-
-* Download package using TBBGet_ and make integration.
-
- Pre-condition: Intel TBB CMake modules are available via <path-to-tbb-cmake-modules>.
-
- CMake code for integration:
-  .. code:: cmake
-
-   include(<path-to-tbb-cmake-modules>/TBBGet.cmake)
-   tbb_get(TBB_ROOT tbb_root CONFIG_DIR TBB_DIR)
-   find_package(TBB <options>)
-
-Source package integration
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-* Build Intel TBB from existing source files using TBBBuild_ and make integration.
-
- Pre-condition: Intel TBB source code is available via <tbb_root> and Intel TBB CMake modules are available via <path-to-tbb-cmake-modules>.
-
- CMake code for integration:
-  .. code:: cmake
-
-   include(<path-to-tbb-cmake-modules>/TBBBuild.cmake)
-   tbb_build(TBB_ROOT <tbb_root> CONFIG_DIR TBB_DIR)
-   find_package(TBB <options>)
-
-* Download Intel TBB source files using TBBGet_, build it using TBBBuild_ and make integration.
-
- Pre-condition: Intel TBB CMake modules are available via <path-to-tbb-cmake-modules>.
-
- CMake code for integration:
-  .. code:: cmake
-
-   include(<path-to-tbb-cmake-modules>/TBBGet.cmake)
-   include(<path-to-tbb-cmake-modules>/TBBBuild.cmake)
-   tbb_get(TBB_ROOT tbb_root SOURCE_CODE)
-   tbb_build(TBB_ROOT ${tbb_root} CONFIG_DIR TBB_DIR)
-   find_package(TBB <options>)
-
-Tutorials: Intel TBB integration using CMake
---------------------------------------------
-Binary Intel TBB integration to the sub_string_finder sample (Windows* OS)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In this example, we will integrate binary Intel TBB package into the sub_string_finder sample on Windows* OS (Microsoft* Visual Studio).
-This example is also applicable for other platforms with slight changes.
-Place holders <version> and <date> should be replaced with the actual values for the Intel TBB package being used. The example is written for `CMake 3.7.1`.
-
-Precondition:
-  * `Microsoft* Visual Studio 11` or higher.
-  * `CMake 3.0.0` or higher.
-
-#. Download the latest binary package for Windows from `this page <https://github.com/01org/tbb/releases/latest>`_ and unpack it to the directory ``C:\demo_tbb_cmake``.
-#. In the directory ``C:\demo_tbb_cmake\tbb<version>_<date>oss\examples\GettingStarted\sub_string_finder`` create ``CMakeLists.txt`` file with the following content:
-    .. code:: cmake
-
-        cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-
-        project(sub_string_finder CXX)
-        add_executable(sub_string_finder sub_string_finder.cpp)
-
-        # find_package will search for available TBBConfig using variables CMAKE_PREFIX_PATH and TBB_DIR.
-        find_package(TBB REQUIRED tbb)
-
-        # Link Intel TBB imported targets to the executable;
-        # "TBB::tbb" can be used instead of "${TBB_IMPORTED_TARGETS}".
-        target_link_libraries(sub_string_finder ${TBB_IMPORTED_TARGETS})
-#. Run CMake GUI and:
-    * Fill the following fields (you can use the buttons ``Browse Source...`` and ``Browse Build...`` accordingly)
-
-     * Where is the source code: ``C:/demo_tbb_cmake/tbb<version>_<date>oss/examples/GettingStarted/sub_string_finder``
-     * Where to build the binaries: ``C:/demo_tbb_cmake/tbb<version>_<date>oss/examples/GettingStarted/sub_string_finder/build``
-
-    * Add new cache entry using button ``Add Entry`` to let CMake know where to search for TBBConfig:
-
-     * Name: ``CMAKE_PREFIX_PATH``
-     * Type: ``PATH``
-     * Value: ``C:/demo_tbb_cmake/tbb<version>_<date>oss``
-
-    * Push the button ``Generate`` and choose a proper generator for your Microsoft* Visual Studio version.
-#. Now you can open the generated solution ``C:/demo_tbb_cmake/tbb<version>_<date>oss/examples/GettingStarted/sub_string_finder/build/sub_string_finder.sln`` in your Microsoft* Visual Studio and build it.
-
-Source code integration of Intel TBB to the sub_string_finder sample (Linux* OS)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In this example, we will build Intel TBB from source code with enabled Community Preview Features and link the sub_string_finder sample with the built library.
-This example is also applicable for other platforms with slight changes.
-
-Precondition:
-  * `CMake 3.0.0` or higher.
-  * `Git` (to clone the Intel TBB repository from GitHub)
-
-#. Create the directory ``~/demo_tbb_cmake``, go to the created directory and clone the Intel TBB repository there:
-    ``mkdir ~/demo_tbb_cmake ; cd ~/demo_tbb_cmake ; git clone https://github.com/01org/tbb.git``
-#. In the directory ``~/demo_tbb_cmake/tbb/examples/GettingStarted/sub_string_finder`` create ``CMakeLists.txt`` file with following content:
-    .. code:: cmake
-
-     cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-
-     project(sub_string_finder CXX)
-     add_executable(sub_string_finder sub_string_finder.cpp)
-
-     include(${TBB_ROOT}/cmake/TBBBuild.cmake)
-
-     # Build Intel TBB with enabled Community Preview Features (CPF).
-     tbb_build(TBB_ROOT ${TBB_ROOT} CONFIG_DIR TBB_DIR MAKE_ARGS tbb_cpf=1)
-
-     find_package(TBB REQUIRED tbb_preview)
-
-     # Link Intel TBB imported targets to the executable;
-     # "TBB::tbb_preview" can be used instead of "${TBB_IMPORTED_TARGETS}".
-     target_link_libraries(sub_string_finder ${TBB_IMPORTED_TARGETS})
-#. Create a build directory for the sub_string_finder sample to perform build out of source, go to the created directory
-    ``mkdir ~/demo_tbb_cmake/tbb/examples/GettingStarted/sub_string_finder/build ; cd ~/demo_tbb_cmake/tbb/examples/GettingStarted/sub_string_finder/build``
-#. Run CMake to prepare Makefile for the sub_string_finder sample and provide Intel TBB location (root) where to perform build:
-    ``cmake -DTBB_ROOT=${HOME}/demo_tbb_cmake/tbb ..``
-#. Make an executable and run it:
-    ``make ; ./sub_string_finder``
-
-Technical documentation for CMake modules
------------------------------------------
-TBBConfig
-^^^^^^^^^
-
-Configuration module for ``Intel(R) Threading Building Blocks (Intel(R) TBB)`` library.
-
-How to use this module in your CMake project:
- #. Add location of Intel TBB (root) to `CMAKE_PREFIX_PATH <https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html>`_
-    or specify location of TBBConfig.cmake in ``TBB_DIR``.
- #. Use `find_package <https://cmake.org/cmake/help/latest/command/find_package.html>`_ to configure Intel TBB.
- #. Use provided variables and/or imported targets (described below) to work with Intel TBB.
-
-Intel TBB components can be passed to `find_package <https://cmake.org/cmake/help/latest/command/find_package.html>`_
-after keyword ``COMPONENTS`` or ``REQUIRED``.
-Use basic names of components (``tbb``, ``tbbmalloc``, ``tbb_preview``, etc.).
-
-If components are not specified then default are used: ``tbb``, ``tbbmalloc`` and ``tbbmalloc_proxy``.
-
-If ``tbbmalloc_proxy`` is requested, ``tbbmalloc`` component will also be added and set as dependency for ``tbbmalloc_proxy``.
-
-TBBConfig creates `imported targets <https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html#imported-targets>`_ as
-shared libraries using the following format: ``TBB::<component>`` (for example, ``TBB::tbb``, ``TBB::tbbmalloc``).
-
-Variables set during Intel TBB configuration:
-
-=========================  ================================================
-         Variable                            Description
-=========================  ================================================
-``TBB_FOUND``              Intel TBB library is found
-``TBB_<component>_FOUND``  specific Intel TBB component is found
-``TBB_IMPORTED_TARGETS``   all created Intel TBB imported targets
-``TBB_VERSION``            Intel TBB version (format: ``<major>.<minor>``)
-``TBB_INTERFACE_VERSION``  Intel TBB interface version
-=========================  ================================================
-
-TBBGet
-^^^^^^
-
-Module for getting ``Intel(R) Threading Building Blocks (Intel(R) TBB)`` library from `GitHub <https://github.com/01org/tbb>`_.
-
-Provides the following functions:
- ``tbb_get(TBB_ROOT <variable> [RELEASE_TAG <release_tag>|LATEST] [SAVE_TO <path>] [SYSTEM_NAME Linux|Windows|Darwin] [CONFIG_DIR <variable> | SOURCE_CODE])``
-  downloads Intel TBB from GitHub and creates TBBConfig for the downloaded binary package if there is no TBBConfig.
-
-  ====================================  ====================================
-                     Parameter                       Description
-  ====================================  ====================================
-  ``TBB_ROOT <variable>``               a variable to save Intel TBB root in, ``<variable>-NOTFOUND`` will be provided in case ``tbb_get`` is unsuccessful
-  ``RELEASE_TAG <release_tag>|LATEST``  Intel TBB release tag to be downloaded (for example, ``2017_U6``), ``LATEST`` is used by default
-  ``SAVE_TO <path>``                    path to location at which to unpack downloaded Intel TBB, ``${CMAKE_CURRENT_BINARY_DIR}/tbb_downloaded`` is used by default
-  ``SYSTEM_NAME Linux|Windows|Darwin``  operating system name to download a binary package for,
-                                        value of `CMAKE_SYSTEM_NAME <https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_NAME.html>`_ is used by default
-  ``CONFIG_DIR <variable>``             a variable to save location of TBBConfig.cmake and TBBConfigVersion.cmake. Ignored if ``SOURCE_CODE`` specified
-  ``SOURCE_CODE``                       flag to get Intel TBB source code (instead of binary package)
-  ====================================  ====================================
-
-TBBMakeConfig
-^^^^^^^^^^^^^
-
-Module for making TBBConfig in ``Intel(R) Threading Building Blocks (Intel(R) TBB)`` binary package.
-
-This module is to be used for packages that do not have TBBConfig.
-
-Provides the following functions:
- ``tbb_make_config(TBB_ROOT <path> CONFIG_DIR <variable> [SYSTEM_NAME Linux|Windows|Darwin])``
-  creates CMake configuration files (TBBConfig.cmake and TBBConfigVersion.cmake) for Intel TBB binary package.
-
-  ====================================  ====================================
-                     Parameter                       Description
-  ====================================  ====================================
-  ``TBB_ROOT <variable>``               path to Intel TBB root
-  ``CONFIG_DIR <variable>``             a variable to store location of the created configuration files
-  ``SYSTEM_NAME Linux|Windows|Darwin``  operating system name of the binary Intel TBB package,
-                                        value of `CMAKE_SYSTEM_NAME <https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_NAME.html>`_ is used by default
-  ====================================  ====================================
-
-TBBBuild
-^^^^^^^^
-
-Module for building ``Intel(R) Threading Building Blocks (Intel(R) TBB)`` library from the source code.
-
-Provides the following functions:
- ``tbb_build(TBB_ROOT <tbb_root> CONFIG_DIR <variable> [MAKE_ARGS <custom_make_arguments>])``
-  builds Intel TBB from source code using the ``Makefile``, creates and provides the location of the CMake configuration files (TBBConfig.cmake and TBBConfigVersion.cmake) .
-
-  =====================================  ====================================
-                Parameter                             Description
-  =====================================  ====================================
-  ``TBB_ROOT <variable>``                path to Intel TBB root
-  ``CONFIG_DIR <variable>``              a variable to store location of the created configuration files,
-                                         ``<variable>-NOTFOUND`` will be provided in case ``tbb_build`` is unsuccessful
-  ``MAKE_ARGS <custom_make_arguments>``  custom arguments to be passed to ``make`` tool.
-
-                                         The following arguments are always passed with automatically detected values to
-                                         ``make`` tool if they are not redefined in ``<custom_make_arguments>``:
-
-                                           - ``compiler=<compiler>``
-                                           - ``tbb_build_dir=<tbb_build_dir>``
-                                           - ``tbb_build_prefix=<tbb_build_prefix>``
-                                           - ``-j<n>``
-  =====================================  ====================================
-
-
-------------
-
-Intel and the Intel logo are trademarks of Intel Corporation or its subsidiaries in the U.S. and/or other countries.
-
-``*`` Other names and brands may be claimed as the property of others.

cmake/TBBBuild.cmake

@@ -1,197 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-#
-# Usage:
-#  include(TBBBuild.cmake)
-#  tbb_build(ROOT <tbb_root> MAKE_ARGS <arg1> [... <argN>])
-#  find_package(TBB <options>)
-#
-
-include(CMakeParseArguments)
-
-# Save the location of Intel TBB CMake modules here, as it will not be possible to do inside functions,
-# see for details: https://cmake.org/cmake/help/latest/variable/CMAKE_CURRENT_LIST_DIR.html
-set(_tbb_cmake_module_path ${CMAKE_CURRENT_LIST_DIR})
-
-##
-# Builds Intel TBB.
-#
-# Parameters:
-#  TBB_ROOT   <directory> - path to Intel TBB root directory (with sources);
-#  MAKE_ARGS  <list>      - user-defined arguments to be passed to make-tool;
-#  CONFIG_DIR <variable>  - store location of the created TBBConfig if the build was ok, store <variable>-NOTFOUND otherwise.
-#
-function(tbb_build)
-    # NOTE: internal function are used to hide them from user.
-
-    ##
-    # Provides arguments for make-command to build Intel TBB.
-    #
-    # Following arguments are provided automatically if they are not defined by user:
-    #  compiler=<value>
-    #  tbb_build_dir=<value>
-    #  tbb_build_prefix=<value>
-    #  -j<n>
-    #
-    # Parameters:
-    #  USER_DEFINED_ARGS <list> - list of user-defined arguments;
-    #  RESULT <variable> - resulting list of 'make' arguments.
-    #
-    function(tbb_get_make_args)
-        set(oneValueArgs RESULT)
-        set(multiValueArgs USER_DEFINED_ARGS)
-        cmake_parse_arguments(tbb_GMA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-        set(result ${tbb_GMA_USER_DEFINED_ARGS})
-
-        if (NOT tbb_GMA_USER_DEFINED_ARGS MATCHES "compiler=")
-            # TODO: add other supported compilers.
-            if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-                set(compiler gcc)
-            elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-                set(compiler icc)
-                if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-                    set(compiler icl)
-                endif()
-            elseif (MSVC)
-                set(compiler cl)
-            elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-                set(compiler clang)
-            endif()
-
-            set(result "compiler=${compiler}" ${result})
-        endif()
-
-        if (NOT tbb_GMA_USER_DEFINED_ARGS MATCHES "tbb_build_dir=")
-            set(result "tbb_build_dir=${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build" ${result})
-        endif()
-
-        if (NOT tbb_GMA_USER_DEFINED_ARGS MATCHES "tbb_build_prefix=")
-            set(result "tbb_build_prefix=tbb_cmake_build_subdir" ${result})
-        endif()
-
-        if (NOT tbb_GMA_USER_DEFINED_ARGS MATCHES "(;|^) *\\-j[0-9]* *(;|$)")
-            include(ProcessorCount)
-            ProcessorCount(num_of_cores)
-            if (NOT num_of_cores EQUAL 0)
-                set(result "-j${num_of_cores}" ${result})
-            endif()
-        endif()
-
-        if (CMAKE_SYSTEM_NAME MATCHES "Android")
-            set(result target=android ${result})
-        endif()
-
-        set(${tbb_GMA_RESULT} ${result} PARENT_SCOPE)
-    endfunction()
-
-    ##
-    # Provides release and debug directories basing on 'make' arguments.
-    #
-    # Following 'make' arguments are parsed: tbb_build_dir, tbb_build_prefix
-    #
-    # Parameters:
-    #  MAKE_ARGS   <list>     - 'make' arguments (tbb_build_dir and tbb_build_prefix are required)
-    #  RELEASE_DIR <variable> - store normalized (CMake) path to release directory
-    #  DEBUG_DIR   <variable> - store normalized (CMake) path to debug directory
-    #
-    function(tbb_get_build_paths_from_make_args)
-        set(oneValueArgs RELEASE_DIR DEBUG_DIR)
-        set(multiValueArgs MAKE_ARGS)
-        cmake_parse_arguments(tbb_GBPFMA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-        foreach(arg ${tbb_GBPFMA_MAKE_ARGS})
-            if (arg MATCHES "tbb_build_dir=")
-                string(REPLACE "tbb_build_dir=" "" tbb_build_dir "${arg}")
-            elseif (arg MATCHES "tbb_build_prefix=")
-                string(REPLACE "tbb_build_prefix=" "" tbb_build_prefix "${arg}")
-            endif()
-        endforeach()
-
-        set(tbb_release_dir "${tbb_build_dir}/${tbb_build_prefix}_release")
-        set(tbb_debug_dir "${tbb_build_dir}/${tbb_build_prefix}_debug")
-
-        file(TO_CMAKE_PATH "${tbb_release_dir}" tbb_release_dir)
-        file(TO_CMAKE_PATH "${tbb_debug_dir}" tbb_debug_dir)
-
-        set(${tbb_GBPFMA_RELEASE_DIR} ${tbb_release_dir} PARENT_SCOPE)
-        set(${tbb_GBPFMA_DEBUG_DIR} ${tbb_debug_dir} PARENT_SCOPE)
-    endfunction()
-
-    # -------------------- #
-    # Function entry point #
-    # -------------------- #
-    set(oneValueArgs TBB_ROOT CONFIG_DIR)
-    set(multiValueArgs MAKE_ARGS)
-    cmake_parse_arguments(tbb_build "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if (NOT EXISTS "${tbb_build_TBB_ROOT}/Makefile" OR NOT EXISTS "${tbb_build_TBB_ROOT}/src")
-        message(STATUS "Intel TBB can not be built: Makefile or src directory was not found in ${tbb_build_TBB_ROOT}")
-        set(${tbb_build_CONFIG_DIR} ${tbb_build_CONFIG_DIR}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    set(make_tool_name make)
-    if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-        set(make_tool_name gmake)
-    elseif (CMAKE_SYSTEM_NAME MATCHES "Android")
-        set(make_tool_name ndk-build)
-    endif()
-
-    find_program(TBB_MAKE_TOOL ${make_tool_name} DOC "Make-tool to build Intel TBB.")
-    mark_as_advanced(TBB_MAKE_TOOL)
-
-    if (NOT TBB_MAKE_TOOL)
-        message(STATUS "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found")
-        set(${tbb_build_CONFIG_DIR} ${tbb_build_CONFIG_DIR}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    tbb_get_make_args(USER_DEFINED_ARGS ${tbb_build_MAKE_ARGS} RESULT tbb_make_args)
-
-    set(tbb_build_cmd ${TBB_MAKE_TOOL} ${tbb_make_args})
-
-    string(REPLACE ";" " " tbb_build_cmd_str "${tbb_build_cmd}")
-    message(STATUS "Building Intel TBB: ${tbb_build_cmd_str}")
-    execute_process(COMMAND ${tbb_build_cmd}
-                    WORKING_DIRECTORY ${tbb_build_TBB_ROOT}
-                    RESULT_VARIABLE tbb_build_result
-                    ERROR_VARIABLE tbb_build_error_output
-                    OUTPUT_QUIET)
-
-    if (NOT tbb_build_result EQUAL 0)
-        message(STATUS "Building is unsuccessful (${tbb_build_result}): ${tbb_build_error_output}")
-        set(${tbb_build_CONFIG_DIR} ${tbb_build_CONFIG_DIR}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    tbb_get_build_paths_from_make_args(MAKE_ARGS ${tbb_make_args}
-                                       RELEASE_DIR tbb_release_dir
-                                       DEBUG_DIR tbb_debug_dir)
-
-    include(${_tbb_cmake_module_path}/TBBMakeConfig.cmake)
-    tbb_make_config(TBB_ROOT ${tbb_build_TBB_ROOT}
-                    SYSTEM_NAME ${CMAKE_SYSTEM_NAME}
-                    CONFIG_DIR tbb_config_dir
-                    CONFIG_FOR_SOURCE
-                    TBB_RELEASE_DIR ${tbb_release_dir}
-                    TBB_DEBUG_DIR ${tbb_debug_dir})
-
-    set(${tbb_build_CONFIG_DIR} ${tbb_config_dir} PARENT_SCOPE)
-endfunction()

cmake/TBBGet.cmake

@@ -1,298 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-include(CMakeParseArguments)
-
-# Save the location of Intel TBB CMake modules here, as it will not be possible to do inside functions,
-# see for details: https://cmake.org/cmake/help/latest/variable/CMAKE_CURRENT_LIST_DIR.html
-set(_tbb_cmake_module_path ${CMAKE_CURRENT_LIST_DIR})
-
-##
-# Downloads file.
-#
-# Parameters:
-#  URL     <url>      - URL to download data from;
-#  SAVE_AS <filename> - filename there to save downloaded data;
-#  INFO    <string>   - text description of content to be downloaded;
-#                       will be printed as message in format is "Downloading <INFO>: <URL>;
-#  FORCE              - option to delete local file from SAVE_AS if it exists;
-#
-function(_tbb_download_file)
-    set(options FORCE)
-    set(oneValueArgs URL RELEASE SAVE_AS INFO)
-    cmake_parse_arguments(tbb_df "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if (tbb_df_FORCE AND EXISTS "${tbb_df_SAVE_AS}")
-        file(REMOVE ${tbb_df_SAVE_AS})
-    endif()
-
-    if (NOT EXISTS "${tbb_df_SAVE_AS}")
-        set(_show_progress)
-        if (TBB_DOWNLOADING_PROGRESS)
-            set(_show_progress SHOW_PROGRESS)
-        endif()
-
-        message(STATUS "Downloading ${tbb_df_INFO}: ${tbb_df_URL}")
-        file(DOWNLOAD ${tbb_df_URL} ${tbb_df_SAVE_AS} ${_show_progress} STATUS download_status)
-
-        list(GET download_status 0 download_status_num)
-        if (NOT download_status_num EQUAL 0)
-            message(STATUS "Unsuccessful downloading: ${download_status}")
-            file(REMOVE ${tbb_df_SAVE_AS})
-            return()
-        endif()
-    else()
-        message(STATUS "Needed file was found locally ${tbb_df_SAVE_AS}. Remove it if you still want to download a new one")
-    endif()
-endfunction()
-
-##
-# Checks if specified Intel TBB release is available on GitHub.
-#
-# tbb_check_git_release(<release> <result>)
-# Parameters:
-#  <release_tag> - release to be checked;
-#  <result>  - store result (TRUE/FALSE).
-#
-function(_tbb_check_git_release_tag _tbb_release_tag _tbb_release_tag_avail)
-    if (_tbb_release_tag STREQUAL LATEST)
-        set(${_tbb_release_tag_avail} TRUE PARENT_SCOPE)
-        return()
-    endif()
-
-    set(tbb_releases_file "${CMAKE_CURRENT_BINARY_DIR}/tbb_releases.json")
-
-    _tbb_download_file(URL     "${tbb_github_api}/releases"
-                       SAVE_AS ${tbb_releases_file}
-                       INFO    "information from GitHub about Intel TBB releases"
-                       FORCE)
-
-    if (NOT EXISTS "${tbb_releases_file}")
-        set(${_tbb_release_tag_avail} FALSE PARENT_SCOPE)
-        return()
-    endif()
-
-    file(READ ${tbb_releases_file} tbb_releases)
-
-    string(REPLACE "\"" "" tbb_releases ${tbb_releases})
-    string(REGEX MATCHALL "tag_name: *([A-Za-z0-9_\\.]+)" tbb_releases ${tbb_releases})
-
-    set(_release_available FALSE)
-    foreach(tbb_rel ${tbb_releases})
-        string(REGEX REPLACE "tag_name: *" "" tbb_rel_cut ${tbb_rel})
-        list(REMOVE_ITEM tbb_releases ${tbb_rel})
-        list(APPEND tbb_releases ${tbb_rel_cut})
-        if (_tbb_release_tag STREQUAL tbb_rel_cut)
-            set(_release_available TRUE)
-            break()
-        endif()
-    endforeach()
-
-    if (NOT _release_available)
-        string(REPLACE ";" ", " tbb_releases_str "${tbb_releases}")
-        message(STATUS "Requested release tag ${_tbb_release_tag} is not available. Available Intel TBB release tags: ${tbb_releases_str}")
-    endif()
-
-    set(${_tbb_release_tag_avail} ${_release_available} PARENT_SCOPE)
-endfunction()
-
-##
-# Compares two Intel TBB releases and provides result
-# TRUE if the first release is less than the second, FALSE otherwise.
-#
-# tbb_is_release_less(<rel1> <rel2> <result>)
-#
-function(_tbb_is_release_less rel1 rel2 result)
-    # Convert release to numeric representation to compare it using "if" with VERSION_LESS.
-    string(REGEX REPLACE "[A-Za-z]" "" rel1 "${rel1}")
-    string(REPLACE "_" "." rel1 "${rel1}")
-    string(REGEX REPLACE "[A-Za-z]" "" rel2 "${rel2}")
-    string(REPLACE "_" "." rel2 "${rel2}")
-
-    if (${rel1} VERSION_LESS ${rel2})
-        set(${result} TRUE PARENT_SCOPE)
-        return()
-    endif()
-
-    set(${result} FALSE PARENT_SCOPE)
-endfunction()
-
-##
-# Finds exact URL to download Intel TBB basing on provided parameters.
-#
-# Usage:
-#  _tbb_get_url(URL <var_to_save_url> RELEASE_TAG <release_tag|LATEST> OS <os> [SOURCE_CODE])
-#
-function(_tbb_get_url)
-    set(oneValueArgs URL RELEASE_TAG OS)
-    set(options SOURCE_CODE)
-    cmake_parse_arguments(tbb_get_url "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(tbb_github_api "https://api.github.com/repos/01org/tbb")
-
-    _tbb_check_git_release_tag(${tbb_get_url_RELEASE_TAG} tbb_release_available)
-    if (NOT tbb_release_available)
-        set(${tbb_download_FULL_PATH} ${tbb_download_FULL_PATH}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    if (tbb_get_url_RELEASE_TAG STREQUAL LATEST)
-        set(tbb_rel_info_api_url "${tbb_github_api}/releases/latest")
-    else()
-        set(tbb_rel_info_api_url "${tbb_github_api}/releases/tags/${tbb_get_url_RELEASE_TAG}")
-    endif()
-
-    set(tbb_release_info_file "${CMAKE_CURRENT_BINARY_DIR}/tbb_${tbb_get_url_RELEASE_TAG}_info.json")
-
-    _tbb_download_file(URL     ${tbb_rel_info_api_url}
-                       SAVE_AS ${tbb_release_info_file}
-                       INFO    "information from GitHub about packages for Intel TBB ${tbb_get_url_RELEASE_TAG}"
-                       FORCE)
-
-    if (NOT EXISTS "${tbb_release_info_file}")
-        set(${tbb_get_url_URL} ${tbb_get_url_URL}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    file(STRINGS ${tbb_release_info_file} tbb_release_info)
-
-    if (tbb_get_url_SOURCE_CODE)
-        # Find name of the latest release to get link to source archive.
-        if (tbb_get_url_RELEASE_TAG STREQUAL LATEST)
-            string(REPLACE "\"" "" tbb_release_info ${tbb_release_info})
-            string(REGEX REPLACE ".*tag_name: *([A-Za-z0-9_\\.]+).*" "\\1" tbb_get_url_RELEASE_TAG "${tbb_release_info}")
-        endif()
-
-        set(${tbb_get_url_URL} "https://github.com/01org/tbb/archive/${tbb_get_url_RELEASE_TAG}.tar.gz" PARENT_SCOPE)
-    else()
-        if (tbb_get_url_OS MATCHES "Linux")
-            set(tbb_lib_archive_suffix lin.tgz)
-        elseif (tbb_get_url_OS MATCHES "Windows")
-            set(tbb_lib_archive_suffix win.zip)
-        elseif (tbb_get_url_OS MATCHES "Darwin")
-            set(tbb_lib_archive_suffix mac.tgz)
-
-            # Since 2017_U4 release archive for Apple has suffix "mac.tgz" instead of "osx.tgz".
-            if (NOT tbb_get_url_RELEASE_TAG STREQUAL "LATEST")
-                _tbb_is_release_less(${tbb_get_url_RELEASE_TAG} 2017_U4 release_less)
-                if (release_less)
-                    set(tbb_lib_archive_suffix osx.tgz)
-                endif()
-            endif()
-        elseif (tbb_get_url_OS MATCHES "Android")
-            set(tbb_lib_archive_suffix and.tgz)
-        else()
-            message(STATUS "Currently prebuilt Intel TBB is not available for your OS (${tbb_get_url_OS})")
-            set(${tbb_get_url_URL} ${tbb_get_url_URL}-NOTFOUND PARENT_SCOPE)
-            return()
-        endif()
-
-        string(REGEX REPLACE ".*(https.*oss_${tbb_lib_archive_suffix}).*" "\\1" tbb_bin_url "${tbb_release_info}")
-
-        set(${tbb_get_url_URL} ${tbb_bin_url} PARENT_SCOPE)
-    endif()
-endfunction()
-
-function(tbb_get)
-    set(oneValueArgs RELEASE_TAG SYSTEM_NAME SAVE_TO TBB_ROOT CONFIG_DIR)
-    set(options SOURCE_CODE)
-    cmake_parse_arguments(tbb_get "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(tbb_os ${CMAKE_SYSTEM_NAME})
-    if (tbb_get_SYSTEM_NAME)
-        set(tbb_os ${tbb_get_SYSTEM_NAME})
-    endif()
-
-    set(tbb_release_tag LATEST)
-    if (tbb_get_RELEASE_TAG)
-        set(tbb_release_tag ${tbb_get_RELEASE_TAG})
-    endif()
-
-    set(tbb_save_to ${CMAKE_CURRENT_BINARY_DIR}/tbb_downloaded)
-    if (tbb_get_SAVE_TO)
-        set(tbb_save_to ${tbb_get_SAVE_TO})
-    endif()
-
-    if (tbb_get_SOURCE_CODE)
-        _tbb_get_url(URL tbb_url RELEASE_TAG ${tbb_release_tag} OS ${tbb_os} SOURCE_CODE)
-    else()
-        _tbb_get_url(URL tbb_url RELEASE_TAG ${tbb_release_tag} OS ${tbb_os})
-    endif()
-
-    if (NOT tbb_url)
-        message(STATUS "URL to download Intel TBB has not been found")
-        set(${tbb_get_TBB_ROOT} ${tbb_get_TBB_ROOT}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    get_filename_component(filename ${tbb_url} NAME)
-    set(local_file "${CMAKE_CURRENT_BINARY_DIR}/${filename}")
-
-    _tbb_download_file(URL     ${tbb_url}
-                       SAVE_AS ${local_file}
-                       INFO    "Intel TBB library")
-
-    if (NOT EXISTS "${local_file}")
-        set(${tbb_get_TBB_ROOT} ${tbb_get_TBB_ROOT}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    get_filename_component(subdir_name ${filename} NAME_WE)
-    file(MAKE_DIRECTORY ${tbb_save_to}/${subdir_name})
-    if (NOT EXISTS "${tbb_save_to}/${subdir_name}")
-        message(STATUS "${tbb_save_to}/${subdir_name} can not be created")
-        set(${tbb_get_TBB_ROOT} ${tbb_get_TBB_ROOT}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    message(STATUS "Unpacking ${local_file} to ${tbb_save_to}/${subdir_name}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${local_file}
-                    WORKING_DIRECTORY ${tbb_save_to}/${subdir_name}
-                    RESULT_VARIABLE unpacking_result)
-
-    if (NOT unpacking_result EQUAL 0)
-        message(STATUS "Unsuccessful unpacking: ${unpacking_result}")
-        set(${tbb_get_TBB_ROOT} ${tbb_get_TBB_ROOT}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    file(GLOB_RECURSE tbb_h ${tbb_save_to}/${subdir_name}/*/include/tbb/tbb.h)
-    list(GET tbb_h 0 tbb_h)
-
-    if (NOT EXISTS "${tbb_h}")
-        message(STATUS "tbb/tbb.h has not been found in the downloaded package")
-        set(${tbb_get_TBB_ROOT} ${tbb_get_TBB_ROOT}-NOTFOUND PARENT_SCOPE)
-        return()
-    endif()
-
-    get_filename_component(tbb_root "${tbb_h}" PATH)
-    get_filename_component(tbb_root "${tbb_root}" PATH)
-    get_filename_component(tbb_root "${tbb_root}" PATH)
-
-    if (NOT tbb_get_SOURCE_CODE)
-        set(tbb_config_dir ${tbb_root}/cmake)
-
-        if (NOT EXISTS "${tbb_config_dir}")
-            tbb_make_config(TBB_ROOT ${tbb_root} CONFIG_DIR tbb_config_dir)
-        endif()
-
-        set(${tbb_get_CONFIG_DIR} ${tbb_config_dir} PARENT_SCOPE)
-    endif()
-
-    set(${tbb_get_TBB_ROOT} ${tbb_root} PARENT_SCOPE)
-endfunction()

cmake/TBBMakeConfig.cmake

@@ -1,169 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-#
-# Usage:
-#   include(TBBMakeConfig.cmake)
-#   tbb_make_config(TBB_ROOT <tbb_root> SYSTEM_NAME <system_name> CONFIG_DIR <var_to_store_config_dir> [SAVE_TO] [CONFIG_FOR_SOURCE TBB_RELEASE_DIR <tbb_release_dir> TBB_DEBUG_DIR <tbb_debug_dir>])
-#
-
-include(CMakeParseArguments)
-
-# Save the location of Intel TBB CMake modules here, as it will not be possible to do inside functions,
-# see for details: https://cmake.org/cmake/help/latest/variable/CMAKE_CURRENT_LIST_DIR.html
-set(_tbb_cmake_module_path ${CMAKE_CURRENT_LIST_DIR})
-
-function(tbb_make_config)
-    set(oneValueArgs TBB_ROOT SYSTEM_NAME CONFIG_DIR SAVE_TO TBB_RELEASE_DIR TBB_DEBUG_DIR)
-    set(options CONFIG_FOR_SOURCE)
-    cmake_parse_arguments(tbb_MK "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(tbb_system_name ${CMAKE_SYSTEM_NAME})
-    if (tbb_MK_SYSTEM_NAME)
-        set(tbb_system_name ${tbb_MK_SYSTEM_NAME})
-    endif()
-
-    set(tbb_config_dir ${tbb_MK_TBB_ROOT}/cmake)
-    if (tbb_MK_SAVE_TO)
-        set(tbb_config_dir ${tbb_MK_SAVE_TO})
-    endif()
-
-    file(MAKE_DIRECTORY ${tbb_config_dir})
-
-    set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy)
-
-    if (tbb_MK_CONFIG_FOR_SOURCE)
-        set(TBB_RELEASE_DIR ${tbb_MK_TBB_RELEASE_DIR})
-        set(TBB_DEBUG_DIR ${tbb_MK_TBB_DEBUG_DIR})
-    endif()
-
-    if (tbb_system_name STREQUAL "Linux")
-        set(TBB_SHARED_LIB_DIR "lib")
-        set(TBB_X32_SUBDIR "ia32")
-        set(TBB_X64_SUBDIR "intel64")
-        set(TBB_LIB_PREFIX "lib")
-        set(TBB_LIB_EXT "so.2")
-
-        # Note: multiline variable
-        set(TBB_CHOOSE_COMPILER_SUBDIR "if (CMAKE_CXX_COMPILER_LOADED)
-    set(_tbb_compiler_id \${CMAKE_CXX_COMPILER_ID})
-    set(_tbb_compiler_ver \${CMAKE_CXX_COMPILER_VERSION})
-elseif (CMAKE_C_COMPILER_LOADED)
-    set(_tbb_compiler_id \${CMAKE_C_COMPILER_ID})
-    set(_tbb_compiler_ver \${CMAKE_C_COMPILER_VERSION})
-endif()
-
-# For non-GCC compilers try to find version of system GCC to choose right compiler subdirectory.
-if (NOT _tbb_compiler_id STREQUAL \"GNU\")
-    execute_process(COMMAND gcc --version OUTPUT_VARIABLE _tbb_gcc_ver_output ERROR_QUIET)
-    string(REGEX REPLACE \".*gcc.*([0-9]+\\\\.[0-9]+)\\\\.[0-9]+.*\" \"\\\\1\" _tbb_compiler_ver \"\${_tbb_gcc_ver_output}\")
-    if (NOT _tbb_compiler_ver)
-        message(FATAL_ERROR \"This Intel TBB package is intended to be used only environment with available 'gcc'\")
-    endif()
-    unset(_tbb_gcc_ver_output)
-endif()
-
-set(_tbb_compiler_subdir gcc4.1)
-foreach (_tbb_gcc_version 4.1 4.4 4.7)
-    if (NOT _tbb_compiler_ver VERSION_LESS \${_tbb_gcc_version})
-        set(_tbb_compiler_subdir gcc\${_tbb_gcc_version})
-    endif()
-endforeach()
-
-unset(_tbb_compiler_id)
-unset(_tbb_compiler_ver)")
-
-    elseif (tbb_system_name STREQUAL "Windows")
-        set(TBB_SHARED_LIB_DIR "bin")
-        set(TBB_X32_SUBDIR "ia32")
-        set(TBB_X64_SUBDIR "intel64")
-        set(TBB_LIB_PREFIX "")
-        set(TBB_LIB_EXT "dll")
-
-        # Note: multiline variable
-        set(TBB_CHOOSE_COMPILER_SUBDIR "if (NOT MSVC)
-    message(FATAL_ERROR \"This Intel TBB package is intended to be used only in the project with MSVC\")
-endif()
-
-# Detect the most relevant MSVC subdirectory
-set(_tbb_msvc_1700_subdir vc11)
-set(_tbb_msvc_1800_subdir vc12)
-set(_tbb_msvc_1900_subdir vc14)
-set(_tbb_msvc_ver \${MSVC_VERSION})
-if (MSVC_VERSION VERSION_LESS 1700)
-    message(FATAL_ERROR \"This Intel TBB package is intended to be used only in the project with MSVC version 1700 (vc11) or higher\")
-elseif (MSVC_VERSION VERSION_GREATER 1900)
-    set(_tbb_msvc_ver 1900)
-endif()
-set(_tbb_compiler_subdir \${_tbb_msvc_\${_tbb_msvc_ver}_subdir})
-unset(_tbb_msvc_1700_subdir)
-unset(_tbb_msvc_1800_subdir)
-unset(_tbb_msvc_1900_subdir)
-
-if (WINDOWS_STORE)
-    set(_tbb_compiler_subdir \${_tbb_compiler_subdir}_ui)
-endif()")
-
-        if (tbb_MK_CONFIG_FOR_SOURCE)
-            set(TBB_IMPLIB_RELEASE "\nIMPORTED_IMPLIB_RELEASE \"${tbb_MK_TBB_RELEASE_DIR}/\${_tbb_component}.lib\"")
-            set(TBB_IMPLIB_DEBUG "\nIMPORTED_IMPLIB_DEBUG \"${tbb_MK_TBB_DEBUG_DIR}/\${_tbb_component}_debug.lib\"")
-        else()
-            # Note: multiline variable
-            set(TBB_IMPLIB "
-                              IMPORTED_IMPLIB_RELEASE       \"\${_tbb_root}/lib/\${_tbb_arch_subdir}/\${_tbb_compiler_subdir}/\${_tbb_component}.lib\"
-                              IMPORTED_IMPLIB_DEBUG         \"\${_tbb_root}/lib/\${_tbb_arch_subdir}/\${_tbb_compiler_subdir}/\${_tbb_component}_debug.lib\"")
-        endif()
-
-        # Note: multiline variable
-        # tbb/internal/_tbb_windef.h (included via tbb/tbb_stddef.h) does implicit linkage of some .lib files, use a special define to avoid it
-        set(TBB_COMPILE_DEFINITIONS "
-                              INTERFACE_COMPILE_DEFINITIONS \"__TBB_NO_IMPLICIT_LINKAGE=1\"")
-    elseif (tbb_system_name STREQUAL "Darwin")
-        set(TBB_SHARED_LIB_DIR "lib")
-        set(TBB_X32_SUBDIR ".")
-        set(TBB_X64_SUBDIR ".")
-        set(TBB_LIB_PREFIX "lib")
-        set(TBB_LIB_EXT "dylib")
-        set(TBB_CHOOSE_COMPILER_SUBDIR "set(_tbb_compiler_subdir .)")
-    elseif (tbb_system_name STREQUAL "Android")
-        set(TBB_SHARED_LIB_DIR "lib")
-        set(TBB_X32_SUBDIR ".")
-        set(TBB_X64_SUBDIR "x86_64")
-        set(TBB_LIB_PREFIX "lib")
-        set(TBB_LIB_EXT "so")
-        set(TBB_CHOOSE_COMPILER_SUBDIR "set(_tbb_compiler_subdir .)")
-    else()
-        message(FATAL_ERROR "Unsupported OS name: ${tbb_system_name}")
-    endif()
-
-    file(READ "${tbb_MK_TBB_ROOT}/include/tbb/tbb_stddef.h" _tbb_stddef)
-    string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}")
-    string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}")
-    string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_stddef}")
-    set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}")
-
-    if (tbb_MK_CONFIG_FOR_SOURCE)
-        set(_tbb_config_template TBBConfigForSource.cmake.in)
-    else()
-        set(_tbb_config_template TBBConfig.cmake.in)
-    endif()
-    configure_file(${_tbb_cmake_module_path}/templates/${_tbb_config_template}   ${tbb_config_dir}/TBBConfig.cmake @ONLY)
-    configure_file(${_tbb_cmake_module_path}/templates/TBBConfigVersion.cmake.in ${tbb_config_dir}/TBBConfigVersion.cmake @ONLY)
-
-    set(${tbb_MK_CONFIG_DIR} ${tbb_config_dir} PARENT_SCOPE)
-endfunction()

cmake/tbb_config_generator.cmake

@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-function(tbb_conf_gen_print_help)
-    message("Usage: cmake -DTBB_ROOT=<tbb_root> -DTBB_OS=Linux|Windows|Darwin [-DSAVE_TO=<path>] -P tbb_config_generator.cmake")
-endfunction()
-
-if (NOT DEFINED TBB_ROOT)
-    tbb_conf_gen_print_help()
-    message(FATAL_ERROR "Required parameter TBB_ROOT is not defined")
-endif()
-
-if (NOT EXISTS "${TBB_ROOT}")
-    tbb_conf_gen_print_help()
-    message(FATAL_ERROR "TBB_ROOT=${TBB_ROOT} does not exist")
-endif()
-
-if (NOT DEFINED TBB_OS)
-    tbb_conf_gen_print_help()
-    message(FATAL_ERROR "Required parameter TBB_OS is not defined")
-endif()
-
-if (DEFINED SAVE_TO)
-    set(tbb_conf_gen_save_to_param SAVE_TO ${SAVE_TO})
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/TBBMakeConfig.cmake)
-tbb_make_config(TBB_ROOT ${TBB_ROOT} CONFIG_DIR tbb_config_dir SYSTEM_NAME ${TBB_OS} ${tbb_conf_gen_save_to_param})
-
-message(STATUS "TBBConfig files were created in ${tbb_config_dir}")

cmake/templates/TBBConfig.cmake.in

@@ -1,89 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-# TBB_FOUND should not be set explicitly. It is defined automatically by CMake.
-# Handling of TBB_VERSION is in TBBConfigVersion.cmake.
-
-if (NOT TBB_FIND_COMPONENTS)
-    set(TBB_FIND_COMPONENTS "@TBB_DEFAULT_COMPONENTS@")
-    foreach (_tbb_component ${TBB_FIND_COMPONENTS})
-        set(TBB_FIND_REQUIRED_${_tbb_component} 1)
-    endforeach()
-endif()
-
-# Add components with internal dependencies: tbbmalloc_proxy -> tbbmalloc
-list(FIND TBB_FIND_COMPONENTS tbbmalloc_proxy _tbbmalloc_proxy_ix)
-if (NOT _tbbmalloc_proxy_ix EQUAL -1)
-    list(FIND TBB_FIND_COMPONENTS tbbmalloc _tbbmalloc_ix)
-    if (_tbbmalloc_ix EQUAL -1)
-        list(APPEND TBB_FIND_COMPONENTS tbbmalloc)
-        set(TBB_FIND_REQUIRED_tbbmalloc ${TBB_FIND_REQUIRED_tbbmalloc_proxy})
-    endif()
-endif()
-
-set(TBB_INTERFACE_VERSION @TBB_INTERFACE_VERSION@)
-
-get_filename_component(_tbb_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_tbb_root "${_tbb_root}" PATH)
-
-set(_tbb_x32_subdir @TBB_X32_SUBDIR@)
-set(_tbb_x64_subdir @TBB_X64_SUBDIR@)
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(_tbb_arch_subdir ${_tbb_x64_subdir})
-else()
-    set(_tbb_arch_subdir ${_tbb_x32_subdir})
-endif()
-
-@TBB_CHOOSE_COMPILER_SUBDIR@
-
-get_filename_component(_tbb_lib_path "${_tbb_root}/@TBB_SHARED_LIB_DIR@/${_tbb_arch_subdir}/${_tbb_compiler_subdir}" ABSOLUTE)
-
-foreach (_tbb_component ${TBB_FIND_COMPONENTS})
-    set(_tbb_release_lib "${_tbb_lib_path}/@TBB_LIB_PREFIX@${_tbb_component}.@TBB_LIB_EXT@")
-    set(_tbb_debug_lib "${_tbb_lib_path}/@TBB_LIB_PREFIX@${_tbb_component}_debug.@TBB_LIB_EXT@")
-
-    if (EXISTS "${_tbb_release_lib}" AND EXISTS "${_tbb_debug_lib}")
-        add_library(TBB::${_tbb_component} SHARED IMPORTED)
-        set_target_properties(TBB::${_tbb_component} PROPERTIES
-                              IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
-                              IMPORTED_LOCATION_RELEASE     "${_tbb_release_lib}"
-                              IMPORTED_LOCATION_DEBUG       "${_tbb_debug_lib}"
-                              INTERFACE_INCLUDE_DIRECTORIES "${_tbb_root}/include"@TBB_IMPLIB@@TBB_COMPILE_DEFINITIONS@)
-
-        # Add internal dependencies for imported targets: TBB::tbbmalloc_proxy -> TBB::tbbmalloc
-        if (_tbb_component STREQUAL tbbmalloc_proxy)
-            set_target_properties(TBB::tbbmalloc_proxy PROPERTIES INTERFACE_LINK_LIBRARIES TBB::tbbmalloc)
-        endif()
-
-        list(APPEND TBB_IMPORTED_TARGETS TBB::${_tbb_component})
-        set(TBB_${_tbb_component}_FOUND 1)
-    elseif (TBB_FIND_REQUIRED AND TBB_FIND_REQUIRED_${_tbb_component})
-        message(FATAL_ERROR "Missed required Intel TBB component: ${_tbb_component}")
-    endif()
-endforeach()
-
-unset(_tbb_x32_subdir)
-unset(_tbb_x64_subdir)
-unset(_tbb_arch_subdir)
-unset(_tbb_compiler_subdir)
-unset(_tbbmalloc_proxy_ix)
-unset(_tbbmalloc_ix)
-unset(_tbb_lib_path)
-unset(_tbb_release_lib)
-unset(_tbb_debug_lib)

cmake/templates/TBBConfigForSource.cmake.in

@@ -1,82 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-# TBB_FOUND should not be set explicitly. It is defined automatically by CMake.
-# Handling of TBB_VERSION is in TBBConfigVersion.cmake.
-
-if (NOT TBB_FIND_COMPONENTS)
-    set(TBB_FIND_COMPONENTS "@TBB_DEFAULT_COMPONENTS@")
-    foreach (_tbb_component ${TBB_FIND_COMPONENTS})
-        set(TBB_FIND_REQUIRED_${_tbb_component} 1)
-    endforeach()
-endif()
-
-# Add components with internal dependencies: tbbmalloc_proxy -> tbbmalloc
-list(FIND TBB_FIND_COMPONENTS tbbmalloc_proxy _tbbmalloc_proxy_ix)
-if (NOT _tbbmalloc_proxy_ix EQUAL -1)
-    list(FIND TBB_FIND_COMPONENTS tbbmalloc _tbbmalloc_ix)
-    if (_tbbmalloc_ix EQUAL -1)
-        list(APPEND TBB_FIND_COMPONENTS tbbmalloc)
-        set(TBB_FIND_REQUIRED_tbbmalloc ${TBB_FIND_REQUIRED_tbbmalloc_proxy})
-    endif()
-endif()
-
-set(TBB_INTERFACE_VERSION @TBB_INTERFACE_VERSION@)
-
-get_filename_component(_tbb_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_tbb_root "${_tbb_root}" PATH)
-
-foreach (_tbb_component ${TBB_FIND_COMPONENTS})
-    set(_tbb_release_lib "@TBB_RELEASE_DIR@/@TBB_LIB_PREFIX@${_tbb_component}.@TBB_LIB_EXT@")
-    set(_tbb_debug_lib "@TBB_DEBUG_DIR@/@TBB_LIB_PREFIX@${_tbb_component}_debug.@TBB_LIB_EXT@")
-
-    if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}")
-        add_library(TBB::${_tbb_component} SHARED IMPORTED)
-        set_target_properties(TBB::${_tbb_component} PROPERTIES
-                              INTERFACE_INCLUDE_DIRECTORIES "${_tbb_root}/include"@TBB_COMPILE_DEFINITIONS@)
-
-
-        if (EXISTS "${_tbb_release_lib}")
-            set_target_properties(TBB::${_tbb_component} PROPERTIES
-                                  IMPORTED_LOCATION_RELEASE "${_tbb_release_lib}"@TBB_IMPLIB_RELEASE@)
-            set_property(TARGET TBB::${_tbb_component} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-        endif()
-
-        if (EXISTS "${_tbb_debug_lib}")
-            set_target_properties(TBB::${_tbb_component} PROPERTIES
-                                  IMPORTED_LOCATION_DEBUG "${_tbb_debug_lib}"@TBB_IMPLIB_DEBUG@)
-            set_property(TARGET TBB::${_tbb_component} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-        endif()
-
-        # Add internal dependencies for imported targets: TBB::tbbmalloc_proxy -> TBB::tbbmalloc
-        if (_tbb_component STREQUAL tbbmalloc_proxy)
-            set_target_properties(TBB::tbbmalloc_proxy PROPERTIES INTERFACE_LINK_LIBRARIES TBB::tbbmalloc)
-        endif()
-
-        list(APPEND TBB_IMPORTED_TARGETS TBB::${_tbb_component})
-        set(TBB_${_tbb_component}_FOUND 1)
-    elseif (TBB_FIND_REQUIRED AND TBB_FIND_REQUIRED_${_tbb_component})
-        message(FATAL_ERROR "Missed required Intel TBB component: ${_tbb_component}")
-    endif()
-endforeach()
-
-unset(_tbbmalloc_proxy_ix)
-unset(_tbbmalloc_ix)
-unset(_tbb_lib_path)
-unset(_tbb_release_lib)
-unset(_tbb_debug_lib)

cmake/templates/TBBConfigVersion.cmake.in

@@ -1,28 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-set(PACKAGE_VERSION @TBB_VERSION@)
-
-if ("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-        set(PACKAGE_VERSION_EXACT TRUE)
-    endif()
-endif()

doc/Release_Notes.txt

@@ -1,6 +1,6 @@
 ------------------------------------------------------------------------
 Intel(R) Threading Building Blocks - Release Notes
-                   Version 2018
+                   Version 2017
 ------------------------------------------------------------------------
 
 
@@ -23,21 +23,21 @@ and compilers listed here.
 Hardware - Recommended
 
     Microsoft* Windows* Systems
-        Intel(R) Core(TM) processor family
-        Intel(R) Xeon(R) processor family
+        Intel(R) Core(TM) processor family or higher
+        Intel(R) Xeon(R) processor family or higher
         Intel(R) Xeon Phi(TM) processor family
     Linux* Systems
-        Intel(R) Core(TM) processor family
-        Intel(R) Xeon(R) processor family
+        Intel(R) Core(TM) processor family or higher
+        Intel(R) Xeon(R) processor family or higher
         Intel(R) Xeon Phi(TM) processor family
-    macOS* Systems
-        Intel(R) Core(TM) processor family
+    OS X* Systems
+        Intel(R) Core(TM) processor family or higher
     Android* Systems
         Intel(R) Atom(TM) processor family
 
 Hardware - Supported
 
-    Intel(R) Pentium(R) 4 processor family
+    Intel(R) Pentium(R) 4 processor family and higher
     Intel(R) Xeon Phi(TM) coprocessor
     Intel(R) Atom(TM) processor family
     Non Intel(R) processors compatible with the above processors
@@ -49,59 +49,55 @@ Software - Minimum Requirements
 
 Software - Recommended
 
-    Intel(R) Parallel Studio XE 2017, 2018
-    Intel(R) System Studio 2017, 2018
+    Intel(R) Parallel Studio XE 2016 and higher
+    Intel(R) System Studio 2016 and higher
 
 Software - Supported Operating Systems
 
     Systems with Microsoft* Windows* operating systems
         Microsoft* Windows* 10
-        Microsoft* Windows* 8.1
+        Microsoft* Windows* 8, 8.1
         Microsoft* Windows* 7 SP1
-        Microsoft* Windows* Server 2016
         Microsoft* Windows* Server 2012 R2
+        Microsoft* Windows* Server 2012
         Microsoft* Windows* Server 2008 R2 SP1
-        Windows* Embedded 10
-        Windows* Embedded 8.1
+        Microsoft* Windows* HPC Server 2008
+        Windows Embedded 8.x, 10
     Systems with Linux* operating systems
-        CentOS 7.1
-        Debian* 8, 9
-        Fedora* 24, 25
+        CentOS 6.5, 7.1
+        Debian* 7, 8
+        Fedora* 20, 21, 22, 23
         Intel(R) Cluster Ready
         Red Hat* Enterprise Linux* 6, 7
         SuSE* Linux* Enterprise Server 11, 12
-        Ubuntu* 14.04 LTS, 16.04 LTS, 17.04
-        WindRiver* Linux 8, 9
-        Yocto 2.2, 2.3
-    Systems with OS X* or macOS* operating systems
-        OS X* 10.10, 10.11
-        macOS* 10.12
+        Ubuntu* 12.04 LTS, 13.10, 14.04 LTS, 15.04, 16.04 LTS
+        WindRiver* Linux 7
+        Yocto 1.7, 1.9 (2.0), 2.1
+    Systems with OS X* operating systems
+        OS X* 10.10 and higher
     Systems with Android* operating systems
-        Android* 5.x, 6.x, 7.x
+        Android* 5.x, 6.x
 
 Software - Supported Compilers
 
-    Intel(R) C++ Compiler 16, 17 and 18 version
-    Microsoft* Visual C++ 12.0 (Microsoft* Visual Studio* 2013,
-        Windows* OS only)
-    Microsoft* Visual C++ 14.0 (Microsoft* Visual Studio* 2015,
-        Windows* OS only)
-    Microsoft* Visual C++ 14.1 (Microsoft* Visual Studio* 2017,
-        Windows* OS only)
-    Microsoft* Windows* Software Development Kit for Windows* 8.1
-    Microsoft* Windows* Software Development Kit for Windows* 10
+    Intel(R) C++ Compiler 15.0 and higher
+    Microsoft* Visual C++ 11.0 (Microsoft* Visual Studio* 2012,
+        Windows* OS only) and higher
+    Microsoft* Windows* Software Development Kit for Windows* 8
+        and higher
     For each supported Linux* operating system, the standard gcc
-        version provided with that operating system is supported
-            GNU Compilers (gcc) 4.1 - 7.1
-            GNU C Library (glibc) version 2.4 - 2.19
-    Xcode* 6.3 - 8.3
-    Android* NDK r10e - r15b
+        version provided with that operating system is supported,
+        starting from
+            GNU Compilers (gcc) 4.1 and higher
+            GNU C Library (glibc) version 2.4 and higher
+    Xcode* 6.3 and higher
+    Android* NDK r10e and higher
 
 Software - Supported Performance Analysis Tools
 
-    Intel(R) VTune(TM) Amplifier XE 2017, 2018.
-    Intel(R) Inspector XE 2017, 2018.
-    Intel(R) Advisor XE 2017, 2018.
+    Intel(R) VTune(TM) Amplifier XE 2016 and higher.
+    Intel(R) Inspector XE 2016 and higher.
+    Intel(R) Advisor XE 2016 and higher.
 
 Known Issues
 ------------
@@ -117,17 +113,11 @@ Library Issues
         the -flifetime-dse=1 option to prevent crashes at runtime,
         or use Intel(R) TBB makefiles that automatically set this option.
 
-    - The current implementation of gfx_factory does not allow memory
-        buffer objects to be used concurrently. As a result, several
-        streaming nodes customized with gfx_factory cannot be connected
-        with each other directly.
-
 ------------------------------------------------------------------------
-(C) 2017 Intel Corporation
+(C) 2016 Intel Corporation
 
-Intel, the Intel logo, Intel Core, Intel Atom, Xeon, Intel Xeon Phi and
-Pentium are trademarks of Intel Corporation in the U.S. and/or other
-countries.
+Intel, the Intel logo, Intel Core, Xeon, Xeon Phi and Pentium are
+trademarks of Intel Corporation in the U.S. and/or other countries.
 
 * Other names and brands may be claimed as the property of others.
 

doc/html/a00001.html

@@ -50,7 +50,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00002.html

@@ -46,7 +46,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00003.html

@@ -48,7 +48,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00004.html

@@ -34,7 +34,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00005.html

@@ -50,7 +50,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00006.html

@@ -44,7 +44,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00007.html

@@ -48,7 +48,7 @@
 </div></div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00008.html

@@ -34,7 +34,7 @@
 </div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="a00264.html">List of all members</a>  </div>
+<a href="a00253.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">__TBB_malloc_proxy_caller Struct Reference</div>  </div>
 </div><!--header-->
@@ -45,7 +45,7 @@
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00009.html

@@ -33,14 +33,14 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>interface5</b></li><li class="navelem"><a class="el" href="a00040.html">concurrent_hash_map</a></li><li class="navelem"><a class="el" href="a00009.html">accessor</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><b>interface5</b></li><li class="navelem"><a class="el" href="a00036.html">concurrent_hash_map</a></li><li class="navelem"><a class="el" href="a00009.html">accessor</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-types">Public Types</a> &#124;
 <a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="a00362.html">List of all members</a>  </div>
+<a href="a00346.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::accessor Class Reference</div>  </div>
 </div><!--header-->
@@ -56,7 +56,7 @@ Inheritance diagram for tbb::interface5::concurrent_hash_map&lt; Key, T, HashCom
  <div class="center">
   <img src="a00009.png" usemap="#tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::accessor_map" alt=""/>
   <map id="tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::accessor_map" name="tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::accessor_map">
-<area href="a00051.html" title="Combines data access, locking, and garbage collection. " alt="tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor" shape="rect" coords="0,56,488,80"/>
+<area href="a00047.html" title="Combines data access, locking, and garbage collection. " alt="tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor" shape="rect" coords="0,56,488,80"/>
 </map>
  </div></div>
 <table class="memberdecls">
@@ -67,12 +67,12 @@ typedef <br class="typebreak"/>
 concurrent_hash_map::value_type&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00009.html#a850178bbdcdbc4cf5955cab37eb8c42c">value_type</a></td></tr>
 <tr class="memdesc:a850178bbdcdbc4cf5955cab37eb8c42c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of value. <br/></td></tr>
 <tr class="separator:a850178bbdcdbc4cf5955cab37eb8c42c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="inherit_header pub_types_a00051"><td colspan="2" onclick="javascript:toggleInherit('pub_types_a00051')"><img src="closed.png" alt="-"/>&#160;Public Types inherited from <a class="el" href="a00051.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
-<tr class="memitem:aa8ca5aef4ee14b7eddb64767b8cd5fda inherit pub_types_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa8ca5aef4ee14b7eddb64767b8cd5fda"></a>
+<tr class="inherit_header pub_types_a00047"><td colspan="2" onclick="javascript:toggleInherit('pub_types_a00047')"><img src="closed.png" alt="-"/>&#160;Public Types inherited from <a class="el" href="a00047.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
+<tr class="memitem:aa8ca5aef4ee14b7eddb64767b8cd5fda inherit pub_types_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa8ca5aef4ee14b7eddb64767b8cd5fda"></a>
 typedef const <br class="typebreak"/>
-concurrent_hash_map::value_type&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#aa8ca5aef4ee14b7eddb64767b8cd5fda">value_type</a></td></tr>
-<tr class="memdesc:aa8ca5aef4ee14b7eddb64767b8cd5fda inherit pub_types_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of value. <br/></td></tr>
-<tr class="separator:aa8ca5aef4ee14b7eddb64767b8cd5fda inherit pub_types_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
+concurrent_hash_map::value_type&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#aa8ca5aef4ee14b7eddb64767b8cd5fda">value_type</a></td></tr>
+<tr class="memdesc:aa8ca5aef4ee14b7eddb64767b8cd5fda inherit pub_types_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of value. <br/></td></tr>
+<tr class="separator:aa8ca5aef4ee14b7eddb64767b8cd5fda inherit pub_types_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
@@ -84,45 +84,45 @@ reference&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href=
 pointer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00009.html#ab04f73bd4a4ca7df0dc91a7b4d66f987">operator-&gt;</a> () const </td></tr>
 <tr class="memdesc:ab04f73bd4a4ca7df0dc91a7b4d66f987"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return pointer to associated value in hash table. <br/></td></tr>
 <tr class="separator:ab04f73bd4a4ca7df0dc91a7b4d66f987"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="inherit_header pub_methods_a00051"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_a00051')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="a00051.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
-<tr class="memitem:a6299b523d2ae8e2613f1bc160ca99b85 inherit pub_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6299b523d2ae8e2613f1bc160ca99b85"></a>
-bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#a6299b523d2ae8e2613f1bc160ca99b85">empty</a> () const </td></tr>
-<tr class="memdesc:a6299b523d2ae8e2613f1bc160ca99b85 inherit pub_methods_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if result is empty. <br/></td></tr>
-<tr class="separator:a6299b523d2ae8e2613f1bc160ca99b85 inherit pub_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a18390cb369369d72bdf7c867755b5190 inherit pub_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a18390cb369369d72bdf7c867755b5190"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#a18390cb369369d72bdf7c867755b5190">release</a> ()</td></tr>
-<tr class="memdesc:a18390cb369369d72bdf7c867755b5190 inherit pub_methods_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set to null. <br/></td></tr>
-<tr class="separator:a18390cb369369d72bdf7c867755b5190 inherit pub_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8adf04e33e7c8c876ba849f26807713a inherit pub_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8adf04e33e7c8c876ba849f26807713a"></a>
-const_reference&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#a8adf04e33e7c8c876ba849f26807713a">operator*</a> () const </td></tr>
-<tr class="memdesc:a8adf04e33e7c8c876ba849f26807713a inherit pub_methods_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return reference to associated value in hash table. <br/></td></tr>
-<tr class="separator:a8adf04e33e7c8c876ba849f26807713a inherit pub_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a28fa9b9e6c35d7e80217e69a7afe1ee5 inherit pub_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a28fa9b9e6c35d7e80217e69a7afe1ee5"></a>
-const_pointer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#a28fa9b9e6c35d7e80217e69a7afe1ee5">operator-&gt;</a> () const </td></tr>
-<tr class="memdesc:a28fa9b9e6c35d7e80217e69a7afe1ee5 inherit pub_methods_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return pointer to associated value in hash table. <br/></td></tr>
-<tr class="separator:a28fa9b9e6c35d7e80217e69a7afe1ee5 inherit pub_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7b26d22d228cf0d8678c9b346c63752c inherit pub_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7b26d22d228cf0d8678c9b346c63752c"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#a7b26d22d228cf0d8678c9b346c63752c">const_accessor</a> ()</td></tr>
-<tr class="memdesc:a7b26d22d228cf0d8678c9b346c63752c inherit pub_methods_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create empty result. <br/></td></tr>
-<tr class="separator:a7b26d22d228cf0d8678c9b346c63752c inherit pub_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afbc0c85a146c912b9a0f94a7695957c7 inherit pub_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afbc0c85a146c912b9a0f94a7695957c7"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00051.html#afbc0c85a146c912b9a0f94a7695957c7">~const_accessor</a> ()</td></tr>
-<tr class="memdesc:afbc0c85a146c912b9a0f94a7695957c7 inherit pub_methods_a00051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy result after releasing the underlying reference. <br/></td></tr>
-<tr class="separator:afbc0c85a146c912b9a0f94a7695957c7 inherit pub_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="inherit_header pub_methods_a00047"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_a00047')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="a00047.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
+<tr class="memitem:a6299b523d2ae8e2613f1bc160ca99b85 inherit pub_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6299b523d2ae8e2613f1bc160ca99b85"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#a6299b523d2ae8e2613f1bc160ca99b85">empty</a> () const </td></tr>
+<tr class="memdesc:a6299b523d2ae8e2613f1bc160ca99b85 inherit pub_methods_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if result is empty. <br/></td></tr>
+<tr class="separator:a6299b523d2ae8e2613f1bc160ca99b85 inherit pub_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a18390cb369369d72bdf7c867755b5190 inherit pub_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a18390cb369369d72bdf7c867755b5190"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#a18390cb369369d72bdf7c867755b5190">release</a> ()</td></tr>
+<tr class="memdesc:a18390cb369369d72bdf7c867755b5190 inherit pub_methods_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set to null. <br/></td></tr>
+<tr class="separator:a18390cb369369d72bdf7c867755b5190 inherit pub_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a8adf04e33e7c8c876ba849f26807713a inherit pub_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8adf04e33e7c8c876ba849f26807713a"></a>
+const_reference&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#a8adf04e33e7c8c876ba849f26807713a">operator*</a> () const </td></tr>
+<tr class="memdesc:a8adf04e33e7c8c876ba849f26807713a inherit pub_methods_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return reference to associated value in hash table. <br/></td></tr>
+<tr class="separator:a8adf04e33e7c8c876ba849f26807713a inherit pub_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a28fa9b9e6c35d7e80217e69a7afe1ee5 inherit pub_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a28fa9b9e6c35d7e80217e69a7afe1ee5"></a>
+const_pointer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#a28fa9b9e6c35d7e80217e69a7afe1ee5">operator-&gt;</a> () const </td></tr>
+<tr class="memdesc:a28fa9b9e6c35d7e80217e69a7afe1ee5 inherit pub_methods_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return pointer to associated value in hash table. <br/></td></tr>
+<tr class="separator:a28fa9b9e6c35d7e80217e69a7afe1ee5 inherit pub_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7b26d22d228cf0d8678c9b346c63752c inherit pub_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7b26d22d228cf0d8678c9b346c63752c"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#a7b26d22d228cf0d8678c9b346c63752c">const_accessor</a> ()</td></tr>
+<tr class="memdesc:a7b26d22d228cf0d8678c9b346c63752c inherit pub_methods_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create empty result. <br/></td></tr>
+<tr class="separator:a7b26d22d228cf0d8678c9b346c63752c inherit pub_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:afbc0c85a146c912b9a0f94a7695957c7 inherit pub_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afbc0c85a146c912b9a0f94a7695957c7"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00047.html#afbc0c85a146c912b9a0f94a7695957c7">~const_accessor</a> ()</td></tr>
+<tr class="memdesc:afbc0c85a146c912b9a0f94a7695957c7 inherit pub_methods_a00047"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy result after releasing the underlying reference. <br/></td></tr>
+<tr class="separator:afbc0c85a146c912b9a0f94a7695957c7 inherit pub_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="inherited"></a>
 Additional Inherited Members</h2></td></tr>
-<tr class="inherit_header pro_methods_a00051"><td colspan="2" onclick="javascript:toggleInherit('pro_methods_a00051')"><img src="closed.png" alt="-"/>&#160;Protected Member Functions inherited from <a class="el" href="a00051.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
-<tr class="memitem:a05b74d408d8cd7773f7b5edfef97da1b inherit pro_methods_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a05b74d408d8cd7773f7b5edfef97da1b"></a>
+<tr class="inherit_header pro_methods_a00047"><td colspan="2" onclick="javascript:toggleInherit('pro_methods_a00047')"><img src="closed.png" alt="-"/>&#160;Protected Member Functions inherited from <a class="el" href="a00047.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
+<tr class="memitem:a05b74d408d8cd7773f7b5edfef97da1b inherit pro_methods_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a05b74d408d8cd7773f7b5edfef97da1b"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>is_writer</b> ()</td></tr>
-<tr class="separator:a05b74d408d8cd7773f7b5edfef97da1b inherit pro_methods_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="inherit_header pro_attribs_a00051"><td colspan="2" onclick="javascript:toggleInherit('pro_attribs_a00051')"><img src="closed.png" alt="-"/>&#160;Protected Attributes inherited from <a class="el" href="a00051.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
-<tr class="memitem:ac9b96f45483ddbff95a95e8e666a8f28 inherit pro_attribs_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac9b96f45483ddbff95a95e8e666a8f28"></a>
-<a class="el" href="a00087.html">node</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>my_node</b></td></tr>
-<tr class="separator:ac9b96f45483ddbff95a95e8e666a8f28 inherit pro_attribs_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a5034084f595666b47734f99a6eaefa9f inherit pro_attribs_a00051"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5034084f595666b47734f99a6eaefa9f"></a>
+<tr class="separator:a05b74d408d8cd7773f7b5edfef97da1b inherit pro_methods_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="inherit_header pro_attribs_a00047"><td colspan="2" onclick="javascript:toggleInherit('pro_attribs_a00047')"><img src="closed.png" alt="-"/>&#160;Protected Attributes inherited from <a class="el" href="a00047.html">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::const_accessor</a></td></tr>
+<tr class="memitem:ac9b96f45483ddbff95a95e8e666a8f28 inherit pro_attribs_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac9b96f45483ddbff95a95e8e666a8f28"></a>
+<a class="el" href="a00078.html">node</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>my_node</b></td></tr>
+<tr class="separator:ac9b96f45483ddbff95a95e8e666a8f28 inherit pro_attribs_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5034084f595666b47734f99a6eaefa9f inherit pro_attribs_a00047"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5034084f595666b47734f99a6eaefa9f"></a>
 hashcode_t&#160;</td><td class="memItemRight" valign="bottom"><b>my_hash</b></td></tr>
-<tr class="separator:a5034084f595666b47734f99a6eaefa9f inherit pro_attribs_a00051"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="separator:a5034084f595666b47734f99a6eaefa9f inherit pro_attribs_a00047"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><h3>template&lt;typename Key, typename T, typename HashCompare = tbb_hash_compare&lt;Key&gt;, typename A = tbb_allocator&lt;std::pair&lt;Key, T&gt; &gt;&gt;<br/>
@@ -135,7 +135,7 @@ class tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::acce
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00010.html

@@ -33,13 +33,13 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>interface5</b></li><li class="navelem"><a class="el" href="a00040.html">concurrent_hash_map</a></li><li class="navelem"><a class="el" href="a00010.html">accessor_not_used</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><b>interface5</b></li><li class="navelem"><a class="el" href="a00036.html">concurrent_hash_map</a></li><li class="navelem"><a class="el" href="a00010.html">accessor_not_used</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="a00363.html">List of all members</a>  </div>
+<a href="a00347.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">tbb::interface5::concurrent_hash_map&lt; Key, T, HashCompare, A &gt;::accessor_not_used Struct Reference</div>  </div>
 </div><!--header-->
@@ -57,7 +57,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>release</b> ()</td></
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00011.html

@@ -33,13 +33,13 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>interface6</b></li><li class="navelem"><a class="el" href="a00011.html">aggregator</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><b>interface6</b></li><li class="navelem"><a class="el" href="a00011.html">aggregator</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="a00382.html">List of all members</a>  </div>
+<a href="a00367.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">tbb::interface6::aggregator Class Reference</div>  </div>
 </div><!--header-->
@@ -70,7 +70,7 @@ Public Member Functions</h2></td></tr>
 Additional Inherited Members</h2></td></tr>
 <tr class="inherit_header pub_methods_a00012"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_a00012')"><img src="closed.png" alt="-"/>&#160;Private Member Functions inherited from <a class="el" href="a00012.html">tbb::interface6::aggregator_ext&lt; internal::basic_handler &gt;</a></td></tr>
 <tr class="memitem:a8ae120a21264cc1ea0a9cfafaa0634e4 inherit pub_methods_a00012"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8ae120a21264cc1ea0a9cfafaa0634e4"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>aggregator_ext</b> (const <a class="el" href="a00023.html">internal::basic_handler</a> &amp;h)</td></tr>
+&#160;</td><td class="memItemRight" valign="bottom"><b>aggregator_ext</b> (const <a class="el" href="a00019.html">internal::basic_handler</a> &amp;h)</td></tr>
 <tr class="separator:a8ae120a21264cc1ea0a9cfafaa0634e4 inherit pub_methods_a00012"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae55b16ec6af204aa00d6a716fccec9f7 inherit pub_methods_a00012"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00012.html#ae55b16ec6af204aa00d6a716fccec9f7">process</a> (<a class="el" href="a00013.html">aggregator_operation</a> *op)</td></tr>
 <tr class="memdesc:ae55b16ec6af204aa00d6a716fccec9f7 inherit pub_methods_a00012"><td class="mdescLeft">&#160;</td><td class="mdescRight">EXPERT INTERFACE: Enter a user-made operation into the aggregator's mailbox.  <a href="#ae55b16ec6af204aa00d6a716fccec9f7">More...</a><br/></td></tr>
@@ -116,7 +116,7 @@ template&lt;typename Body &gt; </div>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00012.html

@@ -33,14 +33,14 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>interface6</b></li><li class="navelem"><a class="el" href="a00012.html">aggregator_ext</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><b>interface6</b></li><li class="navelem"><a class="el" href="a00012.html">aggregator_ext</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
 <a href="#pro-methods">Protected Member Functions</a> &#124;
-<a href="a00381.html">List of all members</a>  </div>
+<a href="a00366.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">tbb::interface6::aggregator_ext&lt; handler_type &gt; Class Template Reference</div>  </div>
 </div><!--header-->
@@ -142,7 +142,7 @@ template&lt;typename handler_type&gt; </div>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00013.html

@@ -33,7 +33,7 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>interface6</b></li><li class="navelem"><a class="el" href="a00013.html">aggregator_operation</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><b>interface6</b></li><li class="navelem"><a class="el" href="a00013.html">aggregator_operation</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
@@ -41,7 +41,7 @@
 <a href="#pub-types">Public Types</a> &#124;
 <a href="#pub-methods">Public Member Functions</a> &#124;
 <a href="#friends">Friends</a> &#124;
-<a href="a00380.html">List of all members</a>  </div>
+<a href="a00365.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">tbb::interface6::aggregator_operation Class Reference</div>  </div>
 </div><!--header-->
@@ -52,8 +52,8 @@ Inheritance diagram for tbb::interface6::aggregator_operation:</div>
  <div class="center">
   <img src="a00013.png" usemap="#tbb::interface6::aggregator_operation_map" alt=""/>
   <map id="tbb::interface6::aggregator_operation_map" name="tbb::interface6::aggregator_operation_map">
-<area href="a00025.html" alt="tbb::interface6::internal::basic_operation_base" shape="rect" coords="0,56,289,80"/>
-<area href="a00024.html" alt="tbb::interface6::internal::basic_operation&lt; Body &gt;" shape="rect" coords="0,112,289,136"/>
+<area href="a00021.html" alt="tbb::interface6::internal::basic_operation_base" shape="rect" coords="0,56,289,80"/>
+<area href="a00020.html" alt="tbb::interface6::internal::basic_operation&lt; Body &gt;" shape="rect" coords="0,112,289,136"/>
 </map>
  </div></div>
 <table class="memberdecls">
@@ -120,7 +120,7 @@ template&lt;typename handler_type &gt; </td></tr>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00014.html

@@ -33,15 +33,15 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><a class="el" href="a00014.html">aligned_space</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><a class="el" href="a00014.html">aligned_space</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="a00266.html">List of all members</a>  </div>
+<a href="a00255.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">tbb::aligned_space&lt; T, N &gt; Class Template Reference<div class="ingroups"><a class="el" href="a00259.html">Memory Allocation</a></div></div>  </div>
+<div class="title">tbb::aligned_space&lt; T, N &gt; Class Template Reference<div class="ingroups"><a class="el" href="a00248.html">Memory Allocation</a></div></div>  </div>
 </div><!--header-->
 <div class="contents">
 
@@ -52,14 +52,14 @@
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:aefcd343548f92c6e738febedf1d75f74"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aefcd343548f92c6e738febedf1d75f74"></a>
-T *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00014.html#aefcd343548f92c6e738febedf1d75f74">begin</a> () const </td></tr>
-<tr class="memdesc:aefcd343548f92c6e738febedf1d75f74"><td class="mdescLeft">&#160;</td><td class="mdescRight">Pointer to beginning of array. <br/></td></tr>
-<tr class="separator:aefcd343548f92c6e738febedf1d75f74"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa2ec5fe3a8f1641884358740766fde34"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa2ec5fe3a8f1641884358740766fde34"></a>
-T *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00014.html#aa2ec5fe3a8f1641884358740766fde34">end</a> () const </td></tr>
-<tr class="memdesc:aa2ec5fe3a8f1641884358740766fde34"><td class="mdescLeft">&#160;</td><td class="mdescRight">Pointer to one past last element in array. <br/></td></tr>
-<tr class="separator:aa2ec5fe3a8f1641884358740766fde34"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3525dbbac0d4eaedfe18bc57b7760857"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3525dbbac0d4eaedfe18bc57b7760857"></a>
+T *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00014.html#a3525dbbac0d4eaedfe18bc57b7760857">begin</a> ()</td></tr>
+<tr class="memdesc:a3525dbbac0d4eaedfe18bc57b7760857"><td class="mdescLeft">&#160;</td><td class="mdescRight">Pointer to beginning of array. <br/></td></tr>
+<tr class="separator:a3525dbbac0d4eaedfe18bc57b7760857"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae95620e1159984a2670bd418ed4748d0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae95620e1159984a2670bd418ed4748d0"></a>
+T *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="a00014.html#ae95620e1159984a2670bd418ed4748d0">end</a> ()</td></tr>
+<tr class="memdesc:ae95620e1159984a2670bd418ed4748d0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Pointer to one past last element in array. <br/></td></tr>
+<tr class="separator:ae95620e1159984a2670bd418ed4748d0"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><h3>template&lt;typename T, size_t N = 1&gt;<br/>
@@ -73,7 +73,7 @@ class tbb::aligned_space&lt; T, N &gt;</h3>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00015.html

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.4"/>
-<title>tbb::flow::interface10::internal::async_helpers&lt; T, typename &gt; Struct Template Reference</title>
+<title>tbb::atomic&lt; T &gt; Struct Template Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -33,60 +33,56 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>flow</b></li><li class="navelem"><b>interface10</b></li><li class="navelem"><b>internal</b></li><li class="navelem"><a class="el" href="a00015.html">async_helpers</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><a class="el" href="a00015.html">atomic</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#pub-types">Public Types</a> &#124;
-<a href="#pub-static-methods">Static Public Member Functions</a> &#124;
-<a href="#pub-static-attribs">Static Public Attributes</a> &#124;
-<a href="a00350.html">List of all members</a>  </div>
+<a href="#pub-methods">Public Member Functions</a> &#124;
+<a href="a00256.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">tbb::flow::interface10::internal::async_helpers&lt; T, typename &gt; Struct Template Reference</div>  </div>
+<div class="title">tbb::atomic&lt; T &gt; Struct Template Reference<div class="ingroups"><a class="el" href="a00249.html">Synchronization</a></div></div>  </div>
 </div><!--header-->
 <div class="contents">
+
+<p>Primary template for atomic.  
+ <a href="a00015.html#details">More...</a></p>
+
+<p><code>#include &lt;atomic.h&gt;</code></p>
+<div class="dynheader">
+Inheritance diagram for tbb::atomic&lt; T &gt;:</div>
+<div class="dyncontent">
+ <div class="center">
+  <img src="a00015.png" usemap="#tbb::atomic&lt; T &gt;_map" alt=""/>
+  <map id="tbb::atomic&lt; T &gt;_map" name="tbb::atomic&lt; T &gt;_map">
+</map>
+ </div></div>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-types"></a>
-Public Types</h2></td></tr>
-<tr class="memitem:a9a483310f1b2e6cfd952906124a09ebb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9a483310f1b2e6cfd952906124a09ebb"></a>
-typedef <a class="el" href="a00017.html">async_msg</a>&lt; T &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>async_type</b></td></tr>
-<tr class="separator:a9a483310f1b2e6cfd952906124a09ebb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:abcefe402ace161e17c974ae2dd3b458a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abcefe402ace161e17c974ae2dd3b458a"></a>
-typedef T&#160;</td><td class="memItemRight" valign="bottom"><b>filtered_type</b></td></tr>
-<tr class="separator:abcefe402ace161e17c974ae2dd3b458a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a>
-Static Public Member Functions</h2></td></tr>
-<tr class="memitem:a2236321141eea81b8367f8786f62c656"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2236321141eea81b8367f8786f62c656"></a>
-static const void *&#160;</td><td class="memItemRight" valign="bottom"><b>to_void_ptr</b> (const T &amp;t)</td></tr>
-<tr class="separator:a2236321141eea81b8367f8786f62c656"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac4b81efe81c177c1fb61142c1655a340"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac4b81efe81c177c1fb61142c1655a340"></a>
-static void *&#160;</td><td class="memItemRight" valign="bottom"><b>to_void_ptr</b> (T &amp;t)</td></tr>
-<tr class="separator:ac4b81efe81c177c1fb61142c1655a340"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac43a4547e19a30fb2156eb7e59f22c61"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac43a4547e19a30fb2156eb7e59f22c61"></a>
-static const T &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>from_void_ptr</b> (const void *p)</td></tr>
-<tr class="separator:ac43a4547e19a30fb2156eb7e59f22c61"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a70bb7b481e7b4786edf07881b7114b09"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a70bb7b481e7b4786edf07881b7114b09"></a>
-static T &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>from_void_ptr</b> (void *p)</td></tr>
-<tr class="separator:a70bb7b481e7b4786edf07881b7114b09"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8737716155b1acede28ae85dc00edaef"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8737716155b1acede28ae85dc00edaef"></a>
-static task *&#160;</td><td class="memItemRight" valign="bottom"><b>try_put_task_wrapper_impl</b> (<a class="el" href="a00122.html">receiver</a>&lt; T &gt; *const this_recv, const void *p, bool is_async)</td></tr>
-<tr class="separator:a8737716155b1acede28ae85dc00edaef"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-attribs"></a>
-Static Public Attributes</h2></td></tr>
-<tr class="memitem:a77c7b633889eff6fbf768a09515c8cfe"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a77c7b633889eff6fbf768a09515c8cfe"></a>
-static const bool&#160;</td><td class="memItemRight" valign="bottom"><b>is_async_type</b> = false</td></tr>
-<tr class="separator:a77c7b633889eff6fbf768a09515c8cfe"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
+Public Member Functions</h2></td></tr>
+<tr class="memitem:a8624826901f5a3267853386bf880bd88"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8624826901f5a3267853386bf880bd88"></a>
+constexpr&#160;</td><td class="memItemRight" valign="bottom"><b>atomic</b> (T arg)</td></tr>
+<tr class="separator:a8624826901f5a3267853386bf880bd88"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5942feb81281f810edddc61a48dd7a39"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5942feb81281f810edddc61a48dd7a39"></a>
+T&#160;</td><td class="memItemRight" valign="bottom"><b>operator=</b> (T rhs)</td></tr>
+<tr class="separator:a5942feb81281f810edddc61a48dd7a39"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7d65b6cae3bd11c79a8e51e25055be52"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7d65b6cae3bd11c79a8e51e25055be52"></a>
+<a class="el" href="a00015.html">atomic</a>&lt; T &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>operator=</b> (const <a class="el" href="a00015.html">atomic</a>&lt; T &gt; &amp;rhs)</td></tr>
+<tr class="separator:a7d65b6cae3bd11c79a8e51e25055be52"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="a00191.html">flow_graph.h</a></li>
+<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
+<div class="textblock"><h3>template&lt;typename T&gt;<br/>
+struct tbb::atomic&lt; T &gt;</h3>
+
+<p>Primary template for atomic. </p>
+<p>See the Reference for details. </p>
+</div><hr/>The documentation for this struct was generated from the following file:<ul>
+<li>atomic.h</li>
 </ul>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00016.html

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.4"/>
-<title>tbb::flow::interface10::internal::async_helpers&lt; T, typename std::enable_if&lt; std::is_base_of&lt; async_msg&lt; typename T::async_msg_data_type &gt;, T &gt;::value &gt;::type &gt; Struct Template Reference</title>
+<title>tbb::atomic&lt; void * &gt; Struct Template Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -33,60 +33,55 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>flow</b></li><li class="navelem"><b>interface10</b></li><li class="navelem"><b>internal</b></li><li class="navelem"><a class="el" href="a00016.html">async_helpers< T, typename std::enable_if< std::is_base_of< async_msg< typename T::async_msg_data_type >, T >::value >::type ></a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><a class="el" href="a00016.html">atomic< void * ></a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#pub-types">Public Types</a> &#124;
-<a href="#pub-static-methods">Static Public Member Functions</a> &#124;
-<a href="#pub-static-attribs">Static Public Attributes</a> &#124;
-<a href="a00351.html">List of all members</a>  </div>
+<a href="#pub-methods">Public Member Functions</a> &#124;
+<a href="a00257.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">tbb::flow::interface10::internal::async_helpers&lt; T, typename std::enable_if&lt; std::is_base_of&lt; async_msg&lt; typename T::async_msg_data_type &gt;, T &gt;::value &gt;::type &gt; Struct Template Reference</div>  </div>
+<div class="title">tbb::atomic&lt; void * &gt; Struct Template Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
+
+<p>Specialization for <a class="el" href="a00016.html" title="Specialization for atomic&lt;void*&gt;, for sake of not allowing arithmetic or operator-&gt;. ">atomic&lt;void*&gt;</a>, for sake of not allowing arithmetic or operator-&gt;.  
+ <a href="a00016.html#details">More...</a></p>
+
+<p><code>#include &lt;atomic.h&gt;</code></p>
+<div class="dynheader">
+Inheritance diagram for tbb::atomic&lt; void * &gt;:</div>
+<div class="dyncontent">
+ <div class="center">
+  <img src="a00016.png" usemap="#tbb::atomic&lt; void * &gt;_map" alt=""/>
+  <map id="tbb::atomic&lt; void * &gt;_map" name="tbb::atomic&lt; void * &gt;_map">
+</map>
+ </div></div>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-types"></a>
-Public Types</h2></td></tr>
-<tr class="memitem:a087d75662143ef3819379262e52fb1a9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a087d75662143ef3819379262e52fb1a9"></a>
-typedef T&#160;</td><td class="memItemRight" valign="bottom"><b>async_type</b></td></tr>
-<tr class="separator:a087d75662143ef3819379262e52fb1a9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a99b3ba7bf9185ece5fc65a014e26e048"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a99b3ba7bf9185ece5fc65a014e26e048"></a>
-typedef T::async_msg_data_type&#160;</td><td class="memItemRight" valign="bottom"><b>filtered_type</b></td></tr>
-<tr class="separator:a99b3ba7bf9185ece5fc65a014e26e048"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a>
-Static Public Member Functions</h2></td></tr>
-<tr class="memitem:af303cbf389e29ff0de60ee6d824c07e5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af303cbf389e29ff0de60ee6d824c07e5"></a>
-static const void *&#160;</td><td class="memItemRight" valign="bottom"><b>to_void_ptr</b> (const T &amp;t)</td></tr>
-<tr class="separator:af303cbf389e29ff0de60ee6d824c07e5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a24cfe0e9b862f04412c6174b6f9f3b69"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a24cfe0e9b862f04412c6174b6f9f3b69"></a>
-static void *&#160;</td><td class="memItemRight" valign="bottom"><b>to_void_ptr</b> (T &amp;t)</td></tr>
-<tr class="separator:a24cfe0e9b862f04412c6174b6f9f3b69"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aff46d0962be22746402cf3a2a4a4e8ea"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aff46d0962be22746402cf3a2a4a4e8ea"></a>
-static const T &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>from_void_ptr</b> (const void *p)</td></tr>
-<tr class="separator:aff46d0962be22746402cf3a2a4a4e8ea"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a448f6a16e2831f45d959628bd6296a7c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a448f6a16e2831f45d959628bd6296a7c"></a>
-static T &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>from_void_ptr</b> (void *p)</td></tr>
-<tr class="separator:a448f6a16e2831f45d959628bd6296a7c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afaba573c1bf66e75146ef561767576eb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afaba573c1bf66e75146ef561767576eb"></a>
-static task *&#160;</td><td class="memItemRight" valign="bottom"><b>try_put_task_wrapper_impl</b> (<a class="el" href="a00122.html">receiver</a>&lt; T &gt; *const this_recv, const void *p, bool is_async)</td></tr>
-<tr class="separator:afaba573c1bf66e75146ef561767576eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-attribs"></a>
-Static Public Attributes</h2></td></tr>
-<tr class="memitem:aef518cf077f5d7658c49e81bf451cd2b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef518cf077f5d7658c49e81bf451cd2b"></a>
-static const bool&#160;</td><td class="memItemRight" valign="bottom"><b>is_async_type</b> = true</td></tr>
-<tr class="separator:aef518cf077f5d7658c49e81bf451cd2b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
+Public Member Functions</h2></td></tr>
+<tr class="memitem:a744970055554db56a922b83dd1125dcf"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a744970055554db56a922b83dd1125dcf"></a>
+constexpr&#160;</td><td class="memItemRight" valign="bottom"><b>atomic</b> (void *arg)</td></tr>
+<tr class="separator:a744970055554db56a922b83dd1125dcf"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3da2906b224154d9961054f07b2e310b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3da2906b224154d9961054f07b2e310b"></a>
+void *&#160;</td><td class="memItemRight" valign="bottom"><b>operator=</b> (void *rhs)</td></tr>
+<tr class="separator:a3da2906b224154d9961054f07b2e310b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a8cb22d05fe655337f6129dc8f3ab6783"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8cb22d05fe655337f6129dc8f3ab6783"></a>
+<a class="el" href="a00015.html">atomic</a>&lt; void * &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>operator=</b> (const <a class="el" href="a00015.html">atomic</a>&lt; void * &gt; &amp;rhs)</td></tr>
+<tr class="separator:a8cb22d05fe655337f6129dc8f3ab6783"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="a00191.html">flow_graph.h</a></li>
+<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
+<div class="textblock"><h3>template&lt;&gt;<br/>
+struct tbb::atomic&lt; void * &gt;</h3>
+
+<p>Specialization for <a class="el" href="a00016.html" title="Specialization for atomic&lt;void*&gt;, for sake of not allowing arithmetic or operator-&gt;. ">atomic&lt;void*&gt;</a>, for sake of not allowing arithmetic or operator-&gt;. </p>
+</div><hr/>The documentation for this struct was generated from the following file:<ul>
+<li>atomic.h</li>
 </ul>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00017.html

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.4"/>
-<title>tbb::flow::interface10::async_msg&lt; T &gt; Class Template Reference</title>
+<title>tbb::interface7::task_arena::attach Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -33,30 +33,28 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>flow</b></li><li class="navelem"><b>interface10</b></li><li class="navelem"><a class="el" href="a00017.html">async_msg</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><b>interface7</b></li><li class="navelem"><a class="el" href="a00139.html">task_arena</a></li><li class="navelem"><a class="el" href="a00017.html">attach</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="headertitle">
-<div class="title">tbb::flow::interface10::async_msg&lt; T &gt; Class Template Reference</div>  </div>
+<div class="title">tbb::interface7::task_arena::attach Struct Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Inheritance diagram for tbb::flow::interface10::async_msg&lt; T &gt;:</div>
-<div class="dyncontent">
- <div class="center">
-  <img src="a00017.png" usemap="#tbb::flow::interface10::async_msg&lt; T &gt;_map" alt=""/>
-  <map id="tbb::flow::interface10::async_msg&lt; T &gt;_map" name="tbb::flow::interface10::async_msg&lt; T &gt;_map">
-<area href="a00091.html" alt="tbb::flow::interface10::opencl_async_msg&lt; T, Factory &gt;" shape="rect" coords="0,56,326,80"/>
-</map>
- </div></div>
-<hr/>The documentation for this class was generated from the following file:<ul>
-<li><a class="el" href="a00191.html">flow_graph.h</a></li>
+
+<p>Tag class used to indicate the "attaching" constructor.  
+ <a href="a00017.html#details">More...</a></p>
+
+<p><code>#include &lt;task_arena.h&gt;</code></p>
+<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
+<div class="textblock"><p>Tag class used to indicate the "attaching" constructor. </p>
+</div><hr/>The documentation for this struct was generated from the following file:<ul>
+<li>task_arena.h</li>
 </ul>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its

doc/html/a00018.html

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.4"/>
-<title>tbb::flow::interface10::internal::async_storage&lt; T &gt; Class Template Reference</title>
+<title>tbb::bad_last_alloc Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -33,21 +33,46 @@
   </div>
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="a00237.html">tbb</a></li><li class="navelem"><b>flow</b></li><li class="navelem"><b>interface10</b></li><li class="navelem"><b>internal</b></li><li class="navelem"><a class="el" href="a00018.html">async_storage</a></li>  </ul>
+<li class="navelem"><a class="el" href="a00228.html">tbb</a></li><li class="navelem"><a class="el" href="a00018.html">bad_last_alloc</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
+  <div class="summary">
+<a href="#pub-methods">Public Member Functions</a> &#124;
+<a href="a00307.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">tbb::flow::interface10::internal::async_storage&lt; T &gt; Class Template Reference</div>  </div>
+<div class="title">tbb::bad_last_alloc Class Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<hr/>The documentation for this class was generated from the following file:<ul>
-<li><a class="el" href="a00191.html">flow_graph.h</a></li>
+
+<p>Exception for concurrent containers.  
+ <a href="a00018.html#details">More...</a></p>
+
+<p><code>#include &lt;tbb_exception.h&gt;</code></p>
+<div class="dynheader">
+Inheritance diagram for tbb::bad_last_alloc:</div>
+<div class="dyncontent">
+ <div class="center">
+  <img src="a00018.png" usemap="#tbb::bad_last_alloc_map" alt=""/>
+  <map id="tbb::bad_last_alloc_map" name="tbb::bad_last_alloc_map">
+</map>
+ </div></div>
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
+Public Member Functions</h2></td></tr>
+<tr class="memitem:ad26fe8a6bd71e097ab339f3d3895d07c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad26fe8a6bd71e097ab339f3d3895d07c"></a>
+const char *&#160;</td><td class="memItemRight" valign="bottom"><b>what</b> () const __TBB_override  throw ()</td></tr>
+<tr class="separator:ad26fe8a6bd71e097ab339f3d3895d07c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table>
+<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
+<div class="textblock"><p>Exception for concurrent containers. </p>
+</div><hr/>The documentation for this class was generated from the following file:<ul>
+<li>tbb_exception.h</li>
 </ul>
 </div><!-- contents -->
 <hr>
 <p></p>
-Copyright &copy; 2005-2017 Intel Corporation.  All Rights Reserved.
+Copyright &copy; 2005-2016 Intel Corporation.  All Rights Reserved.
 <p></p>
 Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are
 registered trademarks or trademarks of Intel Corporation or its