From 2ace525889b0c3de9c90da943fac9259220ef35f Mon Sep 17 00:00:00 2001 From: tbbdev Date: Fri, 1 Mar 2019 17:55:58 +0300 Subject: [PATCH] Committing TBB 2019 Update 4 source code --- CHANGES | 47 +++++++++ Makefile | 2 +- README.md | 4 +- build/AIX.gcc.inc | 2 +- build/AIX.inc | 2 +- build/BSD.clang.inc | 2 +- build/BSD.inc | 2 +- build/FreeBSD.clang.inc | 2 +- build/FreeBSD.gcc.inc | 2 +- build/FreeBSD.inc | 2 +- build/Makefile.rml | 2 +- build/Makefile.tbb | 2 +- build/Makefile.tbbmalloc | 2 +- build/Makefile.tbbproxy | 2 +- build/Makefile.test | 2 +- build/OpenBSD.clang.inc | 2 +- build/OpenBSD.inc | 2 +- build/SunOS.gcc.inc | 2 +- build/SunOS.inc | 2 +- build/SunOS.suncc.inc | 2 +- build/android.clang.inc | 2 +- build/android.gcc.inc | 2 +- build/android.icc.inc | 2 +- build/android.inc | 2 +- build/android.linux.inc | 2 +- build/android.linux.launcher.sh | 2 +- build/android.macos.inc | 2 +- build/android.windows.inc | 2 +- build/big_iron.inc | 2 +- build/build.py | 2 +- build/common.inc | 2 +- build/common_rules.inc | 2 +- build/detect.js | 2 +- build/generate_tbbvars.bat | 2 +- build/generate_tbbvars.sh | 2 +- build/index.html | 2 +- build/ios.clang.inc | 6 +- build/ios.macos.inc | 4 +- build/linux.clang.inc | 2 +- build/linux.gcc.inc | 2 +- build/linux.icc.inc | 2 +- build/linux.inc | 2 +- build/linux.pathcc.inc | 2 +- build/linux.xl.inc | 2 +- build/macos.clang.inc | 12 ++- build/macos.gcc.inc | 2 +- build/macos.icc.inc | 3 +- build/macos.inc | 4 +- build/mic.icc.inc | 2 +- build/mic.linux.inc | 2 +- build/mic.linux.launcher.sh | 2 +- build/mic.offload.inc | 2 +- build/test_launcher.bat | 2 +- build/test_launcher.sh | 2 +- build/version_info_aix.sh | 2 +- build/version_info_android.sh | 2 +- build/version_info_linux.sh | 2 +- build/version_info_macos.sh | 2 +- build/version_info_sunos.sh | 2 +- build/version_info_windows.js | 2 +- build/vs2013/index.html | 2 +- build/windows.cl.inc | 2 +- build/windows.gcc.inc | 2 +- build/windows.icl.inc | 2 +- build/windows.inc | 2 +- cmake/README.rst | 2 +- cmake/TBBBuild.cmake | 8 +- cmake/TBBGet.cmake | 2 +- cmake/TBBMakeConfig.cmake | 12 +-- cmake/tbb_config_generator.cmake | 2 +- cmake/templates/TBBConfig.cmake.in | 22 ++-- cmake/templates/TBBConfigForSource.cmake.in | 2 +- cmake/templates/TBBConfigVersion.cmake.in | 2 +- doc/Release_Notes.txt | 3 +- doc/copyright_brand_disclaimer_doxygen.txt | 2 +- examples/GettingStarted/index.html | 2 +- examples/GettingStarted/sub_string_finder/Makefile | 2 +- .../sub_string_finder/Makefile.windows | 2 +- .../GettingStarted/sub_string_finder/readme.html | 2 +- .../sub_string_finder/sub_string_finder.cpp | 2 +- .../sub_string_finder_extended.cpp | 2 +- .../sub_string_finder/sub_string_finder_pretty.cpp | 2 +- .../sub_string_finder.xcodeproj/project.pbxproj | 8 +- examples/Makefile | 2 +- examples/common/copy_libraries.bat | 2 +- examples/common/examples-common.inc | 2 +- examples/common/gui/Makefile.gmake | 2 +- examples/common/gui/Makefile.win | 2 +- examples/common/gui/convideo.cpp | 2 +- examples/common/gui/d2dvideo.cpp | 2 +- examples/common/gui/dxcheck.bat | 2 +- examples/common/gui/gdivideo.cpp | 2 +- examples/common/gui/macvideo.cpp | 2 +- examples/common/gui/video.h | 2 +- examples/common/gui/winvideo.h | 2 +- examples/common/gui/xcode/tbbExample/OpenGLView.h | 2 +- examples/common/gui/xcode/tbbExample/OpenGLView.m | 2 +- examples/common/gui/xcode/tbbExample/main.m | 2 +- .../common/gui/xcode/tbbExample/tbbAppDelegate.h | 2 +- .../common/gui/xcode/tbbExample/tbbAppDelegate.m | 2 +- .../gui/xcode/tbbExample/tbbExample-Info.plist | 2 +- .../gui/xcode/tbbExample/tbbExample-Prefix.pch | 2 +- examples/common/gui/xvideo.cpp | 2 +- examples/common/index.html | 2 +- examples/common/utility/fast_random.h | 2 +- examples/common/utility/utility.h | 2 +- .../concurrent_hash_map/count_strings/Makefile | 2 +- .../count_strings/Makefile.windows | 2 +- .../count_strings/count_strings.cpp | 2 +- .../concurrent_hash_map/count_strings/readme.html | 2 +- .../xcode/count_strings.xcodeproj/project.pbxproj | 4 +- examples/concurrent_hash_map/index.html | 2 +- examples/concurrent_priority_queue/index.html | 2 +- .../concurrent_priority_queue/shortpath/Makefile | 2 +- .../shortpath/Makefile.windows | 2 +- .../shortpath/readme.html | 2 +- .../shortpath/shortpath.cpp | 2 +- .../xcode/shortpath.xcodeproj/project.pbxproj | 4 +- examples/graph/binpack/Makefile | 2 +- examples/graph/binpack/Makefile.windows | 2 +- examples/graph/binpack/binpack.cpp | 2 +- examples/graph/binpack/readme.html | 2 +- .../xcode/binpack.xcodeproj/project.pbxproj | 4 +- examples/graph/cholesky/Makefile | 2 +- examples/graph/cholesky/Makefile.windows | 2 +- examples/graph/cholesky/cholesky.cpp | 2 +- examples/graph/cholesky/init.cpp | 2 +- examples/graph/cholesky/readme.html | 2 +- .../xcode/cholesky.xcodeproj/project.pbxproj | 4 +- .../xcshareddata/xcschemes/Cholesky.xcscheme | 101 ++++++++++++++++++ examples/graph/dining_philosophers/Makefile | 2 +- .../graph/dining_philosophers/Makefile.windows | 2 +- .../dining_philosophers/dining_philosophers.cpp | 2 +- examples/graph/dining_philosophers/readme.html | 2 +- .../dining_philosophers.xcodeproj/project.pbxproj | 4 +- examples/graph/fgbzip2/Makefile | 2 +- examples/graph/fgbzip2/Makefile.windows | 2 +- examples/graph/fgbzip2/blocksort.cpp | 2 +- examples/graph/fgbzip2/bzlib.cpp | 2 +- examples/graph/fgbzip2/bzlib.h | 2 +- examples/graph/fgbzip2/bzlib_private.h | 2 +- examples/graph/fgbzip2/compress.cpp | 2 +- examples/graph/fgbzip2/crctable.cpp | 2 +- examples/graph/fgbzip2/decompress.cpp | 2 +- examples/graph/fgbzip2/fgbzip2.cpp | 2 +- examples/graph/fgbzip2/huffman.cpp | 2 +- examples/graph/fgbzip2/randtable.cpp | 2 +- examples/graph/fgbzip2/readme.html | 2 +- .../xcode/fgbzip2.xcodeproj/project.pbxproj | 4 +- examples/graph/index.html | 2 +- examples/graph/logic_sim/D_latch.h | 2 +- examples/graph/logic_sim/Makefile | 2 +- examples/graph/logic_sim/Makefile.windows | 2 +- examples/graph/logic_sim/basics.h | 2 +- examples/graph/logic_sim/four_bit_adder.h | 2 +- examples/graph/logic_sim/one_bit_adder.h | 2 +- examples/graph/logic_sim/readme.html | 2 +- examples/graph/logic_sim/test_all.cpp | 2 +- examples/graph/logic_sim/two_bit_adder.h | 2 +- examples/graph/matmult/Makefile | 2 +- examples/graph/matmult/Makefile.windows | 2 +- examples/graph/matmult/matmult.cpp | 2 +- examples/graph/matmult/readme.html | 2 +- examples/graph/som/Makefile | 2 +- examples/graph/som/Makefile.windows | 2 +- examples/graph/som/readme.html | 2 +- examples/graph/som/som.cpp | 2 +- examples/graph/som/som.h | 2 +- examples/graph/som/som_graph.cpp | 2 +- .../graph/som/xcode/som.xcodeproj/project.pbxproj | 4 +- examples/graph/stereo/Makefile | 2 +- examples/graph/stereo/Makefile.windows | 2 +- examples/graph/stereo/imageEffects.cl | 2 +- examples/graph/stereo/lodepng.cpp | 2 +- examples/graph/stereo/lodepng.h | 2 +- examples/graph/stereo/readme.html | 2 +- examples/graph/stereo/stereo.cpp | 2 +- examples/graph/stereo/utils.h | 2 +- .../stereo/xcode/stereo.xcodeproj/project.pbxproj | 4 +- examples/index.html | 2 +- examples/parallel_do/index.html | 2 +- examples/parallel_do/parallel_preorder/Graph.cpp | 2 +- examples/parallel_do/parallel_preorder/Graph.h | 2 +- examples/parallel_do/parallel_preorder/Makefile | 2 +- .../parallel_do/parallel_preorder/Makefile.windows | 2 +- examples/parallel_do/parallel_preorder/Matrix.h | 2 +- examples/parallel_do/parallel_preorder/main.cpp | 2 +- .../parallel_preorder/parallel_preorder.cpp | 2 +- examples/parallel_do/parallel_preorder/readme.html | 2 +- .../parallel_preorder.xcodeproj/project.pbxproj | 4 +- examples/parallel_for/game_of_life/Makefile | 2 +- .../parallel_for/game_of_life/Makefile.windows | 2 +- examples/parallel_for/game_of_life/msvs/resource.h | 2 +- examples/parallel_for/game_of_life/readme.html | 2 +- .../parallel_for/game_of_life/src/AssemblyInfo.cpp | 2 +- examples/parallel_for/game_of_life/src/Board.h | 2 +- .../parallel_for/game_of_life/src/Evolution.cpp | 2 +- examples/parallel_for/game_of_life/src/Evolution.h | 2 +- examples/parallel_for/game_of_life/src/Form1.h | 2 +- .../parallel_for/game_of_life/src/Game_of_life.cpp | 2 +- .../parallel_for/game_of_life/src/Update_state.cpp | 2 +- .../xcode/game_of_life.xcodeproj/project.pbxproj | 4 +- examples/parallel_for/index.html | 2 +- examples/parallel_for/polygon_overlay/Makefile | 2 +- .../parallel_for/polygon_overlay/Makefile.windows | 2 +- .../parallel_for/polygon_overlay/msvs/resource.h | 2 +- examples/parallel_for/polygon_overlay/polymain.cpp | 2 +- examples/parallel_for/polygon_overlay/polymain.h | 2 +- examples/parallel_for/polygon_overlay/polyover.cpp | 2 +- examples/parallel_for/polygon_overlay/polyover.h | 2 +- .../parallel_for/polygon_overlay/pover_global.h | 2 +- .../parallel_for/polygon_overlay/pover_video.cpp | 2 +- .../parallel_for/polygon_overlay/pover_video.h | 2 +- examples/parallel_for/polygon_overlay/readme.html | 2 +- examples/parallel_for/polygon_overlay/rpolygon.h | 2 +- examples/parallel_for/seismic/Makefile | 2 +- examples/parallel_for/seismic/Makefile.windows | 2 +- examples/parallel_for/seismic/main.cpp | 2 +- examples/parallel_for/seismic/msvs/resource.h | 2 +- examples/parallel_for/seismic/readme.html | 2 +- examples/parallel_for/seismic/seismic_video.cpp | 2 +- examples/parallel_for/seismic/seismic_video.h | 2 +- examples/parallel_for/seismic/universe.cpp | 2 +- examples/parallel_for/seismic/universe.h | 2 +- .../xcode/seismic.xcodeproj/project.pbxproj | 6 +- examples/parallel_for/tachyon/Makefile | 2 +- examples/parallel_for/tachyon/Makefile.windows | 2 +- examples/parallel_for/tachyon/msvs/resource.h | 2 +- .../parallel_for/tachyon/msvs/win8ui/App.xaml.cpp | 2 +- .../parallel_for/tachyon/msvs/win8ui/App.xaml.h | 2 +- .../tachyon/msvs/win8ui/DirectXBase.cpp | 2 +- .../parallel_for/tachyon/msvs/win8ui/DirectXBase.h | 2 +- .../tachyon/msvs/win8ui/DirectXPage.xaml.cpp | 2 +- .../tachyon/msvs/win8ui/DirectXPage.xaml.h | 2 +- .../msvs/win8ui/copy_libraries_and_assets.bat | 2 +- examples/parallel_for/tachyon/msvs/win8ui/pch.h | 2 +- .../tachyon/msvs/win8ui/tbbTachyonRenderer.cpp | 2 +- .../tachyon/msvs/win8ui/tbbTachyonRenderer.h | 2 +- examples/parallel_for/tachyon/readme.html | 2 +- examples/parallel_for/tachyon/src/api.cpp | 2 +- examples/parallel_for/tachyon/src/api.h | 2 +- examples/parallel_for/tachyon/src/apigeom.cpp | 2 +- examples/parallel_for/tachyon/src/apitrigeom.cpp | 2 +- examples/parallel_for/tachyon/src/apitrigeom.h | 2 +- examples/parallel_for/tachyon/src/bndbox.cpp | 2 +- examples/parallel_for/tachyon/src/bndbox.h | 2 +- examples/parallel_for/tachyon/src/box.cpp | 2 +- examples/parallel_for/tachyon/src/box.h | 2 +- examples/parallel_for/tachyon/src/camera.cpp | 2 +- examples/parallel_for/tachyon/src/camera.h | 2 +- examples/parallel_for/tachyon/src/coordsys.cpp | 2 +- examples/parallel_for/tachyon/src/coordsys.h | 2 +- examples/parallel_for/tachyon/src/cylinder.cpp | 2 +- examples/parallel_for/tachyon/src/cylinder.h | 2 +- examples/parallel_for/tachyon/src/extvol.cpp | 2 +- examples/parallel_for/tachyon/src/extvol.h | 2 +- examples/parallel_for/tachyon/src/global.cpp | 2 +- examples/parallel_for/tachyon/src/global.h | 2 +- examples/parallel_for/tachyon/src/grid.cpp | 2 +- examples/parallel_for/tachyon/src/grid.h | 2 +- examples/parallel_for/tachyon/src/imageio.cpp | 2 +- examples/parallel_for/tachyon/src/imageio.h | 2 +- examples/parallel_for/tachyon/src/imap.cpp | 2 +- examples/parallel_for/tachyon/src/imap.h | 2 +- examples/parallel_for/tachyon/src/intersect.cpp | 2 +- examples/parallel_for/tachyon/src/intersect.h | 2 +- examples/parallel_for/tachyon/src/jpeg.cpp | 2 +- examples/parallel_for/tachyon/src/jpeg.h | 2 +- examples/parallel_for/tachyon/src/light.cpp | 2 +- examples/parallel_for/tachyon/src/light.h | 2 +- examples/parallel_for/tachyon/src/machine.h | 2 +- examples/parallel_for/tachyon/src/macros.h | 2 +- examples/parallel_for/tachyon/src/main.cpp | 2 +- examples/parallel_for/tachyon/src/objbound.cpp | 2 +- examples/parallel_for/tachyon/src/objbound.h | 2 +- examples/parallel_for/tachyon/src/parse.cpp | 2 +- examples/parallel_for/tachyon/src/parse.h | 2 +- examples/parallel_for/tachyon/src/plane.cpp | 2 +- examples/parallel_for/tachyon/src/plane.h | 2 +- examples/parallel_for/tachyon/src/ppm.cpp | 2 +- examples/parallel_for/tachyon/src/ppm.h | 2 +- examples/parallel_for/tachyon/src/pthread.cpp | 2 +- examples/parallel_for/tachyon/src/pthread_w.h | 2 +- examples/parallel_for/tachyon/src/quadric.cpp | 2 +- examples/parallel_for/tachyon/src/quadric.h | 2 +- examples/parallel_for/tachyon/src/render.cpp | 2 +- examples/parallel_for/tachyon/src/render.h | 2 +- examples/parallel_for/tachyon/src/ring.cpp | 2 +- examples/parallel_for/tachyon/src/ring.h | 2 +- examples/parallel_for/tachyon/src/shade.cpp | 2 +- examples/parallel_for/tachyon/src/shade.h | 2 +- examples/parallel_for/tachyon/src/sphere.cpp | 2 +- examples/parallel_for/tachyon/src/sphere.h | 2 +- .../parallel_for/tachyon/src/tachyon_video.cpp | 2 +- examples/parallel_for/tachyon/src/tachyon_video.h | 2 +- examples/parallel_for/tachyon/src/texture.cpp | 2 +- examples/parallel_for/tachyon/src/texture.h | 2 +- examples/parallel_for/tachyon/src/tgafile.cpp | 2 +- examples/parallel_for/tachyon/src/tgafile.h | 2 +- examples/parallel_for/tachyon/src/trace.h | 2 +- examples/parallel_for/tachyon/src/trace.serial.cpp | 2 +- examples/parallel_for/tachyon/src/trace.simple.cpp | 2 +- examples/parallel_for/tachyon/src/trace.tbb.cpp | 2 +- examples/parallel_for/tachyon/src/trace.tbb1d.cpp | 2 +- examples/parallel_for/tachyon/src/trace_rest.cpp | 2 +- examples/parallel_for/tachyon/src/triangle.cpp | 2 +- examples/parallel_for/tachyon/src/triangle.h | 2 +- examples/parallel_for/tachyon/src/types.h | 2 +- examples/parallel_for/tachyon/src/ui.cpp | 2 +- examples/parallel_for/tachyon/src/ui.h | 2 +- examples/parallel_for/tachyon/src/util.cpp | 2 +- examples/parallel_for/tachyon/src/util.h | 2 +- examples/parallel_for/tachyon/src/vector.cpp | 2 +- examples/parallel_for/tachyon/src/vector.h | 2 +- examples/parallel_for/tachyon/src/vol.cpp | 2 +- examples/parallel_for/tachyon/src/vol.h | 2 +- .../xcode/tachyon.xcodeproj/project.pbxproj | 10 +- examples/parallel_reduce/convex_hull/Makefile | 2 +- .../parallel_reduce/convex_hull/Makefile.windows | 2 +- examples/parallel_reduce/convex_hull/convex_hull.h | 2 +- .../convex_hull/convex_hull_bench.cpp | 2 +- .../convex_hull/convex_hull_sample.cpp | 2 +- examples/parallel_reduce/convex_hull/readme.html | 32 +++--- .../xcode/convex_hull.xcodeproj/project.pbxproj | 6 +- examples/parallel_reduce/index.html | 2 +- examples/parallel_reduce/primes/Makefile | 2 +- examples/parallel_reduce/primes/Makefile.windows | 2 +- examples/parallel_reduce/primes/main.cpp | 2 +- examples/parallel_reduce/primes/primes.cpp | 2 +- examples/parallel_reduce/primes/primes.h | 2 +- examples/parallel_reduce/primes/readme.html | 2 +- .../primes/xcode/primes.xcodeproj/project.pbxproj | 4 +- examples/pipeline/index.html | 2 +- examples/pipeline/square/Makefile | 2 +- examples/pipeline/square/Makefile.windows | 2 +- examples/pipeline/square/gen_input.cpp | 2 +- examples/pipeline/square/readme.html | 2 +- examples/pipeline/square/square.cpp | 2 +- .../square/xcode/square.xcodeproj/project.pbxproj | 4 +- examples/task/index.html | 2 +- examples/task/tree_sum/Makefile | 2 +- examples/task/tree_sum/Makefile.windows | 2 +- .../task/tree_sum/OptimizedParallelSumTree.cpp | 2 +- examples/task/tree_sum/SerialSumTree.cpp | 2 +- examples/task/tree_sum/SimpleParallelSumTree.cpp | 2 +- examples/task/tree_sum/TreeMaker.h | 2 +- examples/task/tree_sum/common.h | 2 +- examples/task/tree_sum/main.cpp | 2 +- examples/task/tree_sum/readme.html | 2 +- .../xcode/tree_sum.xcodeproj/project.pbxproj | 4 +- examples/task_arena/fractal/Makefile | 2 +- examples/task_arena/fractal/Makefile.windows | 2 +- examples/task_arena/fractal/fractal.cpp | 2 +- examples/task_arena/fractal/fractal.h | 2 +- examples/task_arena/fractal/fractal_video.h | 2 +- examples/task_arena/fractal/main.cpp | 2 +- examples/task_arena/fractal/msvs/resource.h | 2 +- examples/task_arena/fractal/readme.html | 2 +- .../xcode/fractal.xcodeproj/project.pbxproj | 6 +- examples/task_arena/index.html | 2 +- examples/task_group/index.html | 2 +- examples/task_group/sudoku/Makefile | 2 +- examples/task_group/sudoku/Makefile.windows | 2 +- examples/task_group/sudoku/readme.html | 2 +- examples/task_group/sudoku/sudoku.cpp | 2 +- .../sudoku/xcode/sudoku.xcodeproj/project.pbxproj | 4 +- examples/test_all/fibonacci/Fibonacci.cpp | 2 +- examples/test_all/fibonacci/Makefile | 2 +- examples/test_all/fibonacci/Makefile.windows | 2 +- examples/test_all/fibonacci/readme.html | 2 +- .../xcode/fibonacci.xcodeproj/project.pbxproj | 4 +- examples/test_all/index.html | 2 +- include/index.html | 2 +- include/serial/tbb/parallel_for.h | 2 +- include/serial/tbb/tbb_annotate.h | 2 +- include/tbb/aggregator.h | 2 +- include/tbb/aligned_space.h | 2 +- include/tbb/atomic.h | 2 +- include/tbb/blocked_range.h | 2 +- include/tbb/blocked_range2d.h | 2 +- include/tbb/blocked_range3d.h | 2 +- include/tbb/blocked_rangeNd.h | 2 +- include/tbb/cache_aligned_allocator.h | 82 ++++++++++++++- include/tbb/combinable.h | 2 +- include/tbb/compat/condition_variable | 2 +- include/tbb/compat/ppl.h | 2 +- include/tbb/compat/thread | 2 +- include/tbb/compat/tuple | 2 +- include/tbb/concurrent_hash_map.h | 37 ++++++- include/tbb/concurrent_lru_cache.h | 2 +- include/tbb/concurrent_priority_queue.h | 2 +- include/tbb/concurrent_queue.h | 7 +- include/tbb/concurrent_unordered_map.h | 69 ++++++++++++- include/tbb/concurrent_unordered_set.h | 69 ++++++++++++- include/tbb/concurrent_vector.h | 27 ++--- include/tbb/critical_section.h | 2 +- include/tbb/enumerable_thread_specific.h | 2 +- include/tbb/flow_graph.h | 2 +- include/tbb/flow_graph_abstractions.h | 2 +- include/tbb/flow_graph_opencl_node.h | 2 +- include/tbb/gfx_factory.h | 2 +- include/tbb/global_control.h | 6 +- include/tbb/index.html | 2 +- include/tbb/internal/_aggregator_impl.h | 2 +- include/tbb/internal/_allocator_traits.h | 113 +++++++++++++++++++++ include/tbb/internal/_concurrent_queue_impl.h | 2 +- include/tbb/internal/_concurrent_unordered_impl.h | 41 ++++---- include/tbb/internal/_flow_graph_async_msg_impl.h | 2 +- include/tbb/internal/_flow_graph_body_impl.h | 5 +- include/tbb/internal/_flow_graph_cache_impl.h | 2 +- include/tbb/internal/_flow_graph_impl.h | 2 +- include/tbb/internal/_flow_graph_indexer_impl.h | 2 +- .../tbb/internal/_flow_graph_item_buffer_impl.h | 2 +- include/tbb/internal/_flow_graph_join_impl.h | 2 +- include/tbb/internal/_flow_graph_node_impl.h | 2 +- include/tbb/internal/_flow_graph_streaming_node.h | 2 +- .../tbb/internal/_flow_graph_tagged_buffer_impl.h | 2 +- include/tbb/internal/_flow_graph_trace_impl.h | 2 +- include/tbb/internal/_flow_graph_types_impl.h | 2 +- include/tbb/internal/_mutex_padding.h | 2 +- include/tbb/internal/_range_iterator.h | 2 +- include/tbb/internal/_tbb_hash_compare_impl.h | 2 +- include/tbb/internal/_tbb_strings.h | 2 +- include/tbb/internal/_tbb_trace_impl.h | 2 +- include/tbb/internal/_tbb_windef.h | 2 +- include/tbb/internal/_template_helpers.h | 70 ++++++++++++- include/tbb/internal/_x86_eliding_mutex_impl.h | 2 +- include/tbb/internal/_x86_rtm_rw_mutex_impl.h | 2 +- include/tbb/iterators.h | 13 ++- include/tbb/machine/gcc_arm.h | 2 +- include/tbb/machine/gcc_generic.h | 2 +- include/tbb/machine/gcc_ia32_common.h | 2 +- include/tbb/machine/gcc_itsx.h | 2 +- include/tbb/machine/ibm_aix51.h | 2 +- include/tbb/machine/icc_generic.h | 2 +- include/tbb/machine/linux_common.h | 2 +- include/tbb/machine/linux_ia32.h | 2 +- include/tbb/machine/linux_ia64.h | 2 +- include/tbb/machine/linux_intel64.h | 2 +- include/tbb/machine/mac_ppc.h | 2 +- include/tbb/machine/macos_common.h | 2 +- include/tbb/machine/mic_common.h | 2 +- include/tbb/machine/msvc_armv7.h | 2 +- include/tbb/machine/msvc_ia32_common.h | 2 +- include/tbb/machine/sunos_sparc.h | 2 +- include/tbb/machine/windows_api.h | 2 +- include/tbb/machine/windows_ia32.h | 2 +- include/tbb/machine/windows_intel64.h | 2 +- include/tbb/memory_pool.h | 2 +- include/tbb/mutex.h | 2 +- include/tbb/null_mutex.h | 2 +- include/tbb/null_rw_mutex.h | 2 +- include/tbb/parallel_do.h | 2 +- include/tbb/parallel_for.h | 2 +- include/tbb/parallel_for_each.h | 2 +- include/tbb/parallel_invoke.h | 2 +- include/tbb/parallel_reduce.h | 2 +- include/tbb/parallel_scan.h | 2 +- include/tbb/parallel_sort.h | 2 +- include/tbb/parallel_while.h | 2 +- include/tbb/partitioner.h | 2 +- include/tbb/pipeline.h | 2 +- include/tbb/queuing_mutex.h | 2 +- include/tbb/queuing_rw_mutex.h | 2 +- include/tbb/reader_writer_lock.h | 2 +- include/tbb/recursive_mutex.h | 2 +- include/tbb/runtime_loader.h | 2 +- include/tbb/scalable_allocator.h | 51 +++++++++- include/tbb/spin_mutex.h | 2 +- include/tbb/spin_rw_mutex.h | 2 +- include/tbb/task.h | 6 +- include/tbb/task_arena.h | 2 +- include/tbb/task_group.h | 2 +- include/tbb/task_scheduler_init.h | 2 +- include/tbb/task_scheduler_observer.h | 2 +- include/tbb/tbb.h | 4 +- include/tbb/tbb_allocator.h | 2 +- include/tbb/tbb_config.h | 39 ++++--- include/tbb/tbb_disable_exceptions.h | 2 +- include/tbb/tbb_exception.h | 2 +- include/tbb/tbb_machine.h | 2 +- include/tbb/tbb_profiling.h | 2 +- include/tbb/tbb_stddef.h | 17 +--- include/tbb/tbb_thread.h | 2 +- include/tbb/tbbmalloc_proxy.h | 5 +- include/tbb/tick_count.h | 2 +- index.html | 2 +- jni/Android.mk | 2 +- jni/Application.mk | 2 +- python/Makefile | 2 +- python/TBB.py | 2 +- python/index.html | 2 +- python/rml/Makefile | 2 +- python/rml/ipc_server.cpp | 2 +- python/rml/ipc_utils.cpp | 2 +- python/rml/ipc_utils.h | 2 +- python/setup.py | 2 +- python/tbb/__init__.py | 2 +- python/tbb/__main__.py | 2 +- python/tbb/api.i | 3 +- python/tbb/pool.py | 2 +- python/tbb/test.py | 2 +- src/Makefile | 2 +- src/index.html | 2 +- src/old/concurrent_queue_v2.cpp | 2 +- src/old/concurrent_queue_v2.h | 2 +- src/old/concurrent_vector_v2.cpp | 2 +- src/old/concurrent_vector_v2.h | 2 +- src/old/spin_rw_mutex_v2.cpp | 2 +- src/old/spin_rw_mutex_v2.h | 2 +- src/old/task_v2.cpp | 2 +- src/old/test_concurrent_queue_v2.cpp | 2 +- src/old/test_concurrent_vector_v2.cpp | 2 +- src/old/test_mutex_v2.cpp | 2 +- src/old/test_task_scheduler_observer_v3.cpp | 2 +- src/perf/coarse_grained_raii_lru_cache.h | 2 +- src/perf/cpq_pdes.cpp | 2 +- src/perf/fibonacci_impl_tbb.cpp | 2 +- src/perf/perf.cpp | 2 +- src/perf/perf.h | 2 +- src/perf/perf_sched.cpp | 2 +- src/perf/run_statistics.sh | 2 +- src/perf/statistics.cpp | 2 +- src/perf/statistics.h | 2 +- src/perf/statistics_xml.h | 2 +- src/perf/time_async_return.cpp | 2 +- src/perf/time_cpq_throughput_test.cpp | 2 +- src/perf/time_fibonacci_cutoff.cpp | 2 +- src/perf/time_framework.h | 2 +- src/perf/time_hash_map.cpp | 2 +- src/perf/time_hash_map_fill.cpp | 2 +- src/perf/time_hash_map_fill.html | 2 +- src/perf/time_locked_work.cpp | 2 +- src/perf/time_lru_cache_throughput.cpp | 2 +- src/perf/time_parallel_for_each.cpp | 2 +- src/perf/time_sandbox.h | 2 +- src/perf/time_split_node.cpp | 2 +- src/perf/time_vector.cpp | 2 +- src/rml/client/index.html | 2 +- src/rml/client/library_assert.h | 2 +- src/rml/client/omp_dynamic_link.cpp | 2 +- src/rml/client/omp_dynamic_link.h | 2 +- src/rml/client/rml_factory.h | 2 +- src/rml/client/rml_omp.cpp | 2 +- src/rml/client/rml_tbb.cpp | 2 +- src/rml/include/index.html | 2 +- src/rml/include/rml_base.h | 2 +- src/rml/include/rml_omp.h | 2 +- src/rml/include/rml_tbb.h | 2 +- src/rml/index.html | 2 +- src/rml/perfor/omp_nested.cpp | 2 +- src/rml/perfor/omp_simple.cpp | 2 +- src/rml/perfor/tbb_multi_omp.cpp | 2 +- src/rml/perfor/tbb_simple.cpp | 2 +- src/rml/perfor/thread_level.h | 2 +- src/rml/server/index.html | 2 +- src/rml/server/irml.rc | 4 +- src/rml/server/job_automaton.h | 2 +- src/rml/server/lin-rml-export.def | 2 +- src/rml/server/rml_server.cpp | 2 +- src/rml/server/thread_monitor.h | 2 +- src/rml/server/wait_counter.h | 2 +- src/rml/server/win32-rml-export.def | 2 +- src/rml/server/win64-rml-export.def | 2 +- src/rml/test/rml_omp_stub.cpp | 2 +- src/rml/test/test_job_automaton.cpp | 2 +- src/rml/test/test_rml_mixed.cpp | 2 +- src/rml/test/test_rml_omp.cpp | 2 +- src/rml/test/test_rml_omp_c_linkage.c | 2 +- src/rml/test/test_rml_tbb.cpp | 2 +- src/rml/test/test_server.h | 2 +- src/rml/test/test_thread_monitor.cpp | 2 +- src/tbb/arena.cpp | 2 +- src/tbb/arena.h | 2 +- src/tbb/cache_aligned_allocator.cpp | 2 +- src/tbb/cilk-tbb-interop.h | 2 +- src/tbb/concurrent_hash_map.cpp | 2 +- src/tbb/concurrent_monitor.cpp | 2 +- src/tbb/concurrent_monitor.h | 2 +- src/tbb/concurrent_queue.cpp | 2 +- src/tbb/concurrent_vector.cpp | 2 +- src/tbb/condition_variable.cpp | 2 +- src/tbb/critical_section.cpp | 2 +- src/tbb/custom_scheduler.h | 2 +- src/tbb/dynamic_link.cpp | 2 +- src/tbb/dynamic_link.h | 2 +- src/tbb/governor.cpp | 2 +- src/tbb/governor.h | 2 +- src/tbb/ia32-masm/atomic_support.asm | 2 +- src/tbb/ia32-masm/itsx.asm | 2 +- src/tbb/ia32-masm/lock_byte.asm | 2 +- src/tbb/ia64-gas/atomic_support.s | 2 +- src/tbb/ia64-gas/ia64_misc.s | 2 +- src/tbb/ia64-gas/lock_byte.s | 2 +- src/tbb/ia64-gas/log2.s | 2 +- src/tbb/ia64-gas/pause.s | 2 +- src/tbb/ibm_aix51/atomic_support.c | 2 +- src/tbb/index.html | 2 +- src/tbb/intel64-masm/atomic_support.asm | 2 +- src/tbb/intel64-masm/intel64_misc.asm | 2 +- src/tbb/intel64-masm/itsx.asm | 2 +- src/tbb/intrusive_list.h | 2 +- src/tbb/itt_notify.cpp | 2 +- src/tbb/itt_notify.h | 2 +- src/tbb/lin32-tbb-export.def | 2 +- src/tbb/lin32-tbb-export.lst | 2 +- src/tbb/lin64-tbb-export.def | 2 +- src/tbb/lin64-tbb-export.lst | 2 +- src/tbb/lin64ipf-tbb-export.def | 2 +- src/tbb/lin64ipf-tbb-export.lst | 2 +- src/tbb/mac32-tbb-export.def | 2 +- src/tbb/mac32-tbb-export.lst | 2 +- src/tbb/mac64-tbb-export.def | 2 +- src/tbb/mac64-tbb-export.lst | 2 +- src/tbb/mailbox.h | 2 +- src/tbb/market.cpp | 2 +- src/tbb/market.h | 2 +- src/tbb/mutex.cpp | 2 +- src/tbb/observer_proxy.cpp | 2 +- src/tbb/observer_proxy.h | 2 +- src/tbb/pipeline.cpp | 2 +- src/tbb/private_server.cpp | 2 +- src/tbb/queuing_mutex.cpp | 2 +- src/tbb/queuing_rw_mutex.cpp | 2 +- src/tbb/reader_writer_lock.cpp | 2 +- src/tbb/recursive_mutex.cpp | 2 +- src/tbb/scheduler.cpp | 2 +- src/tbb/scheduler.h | 2 +- src/tbb/scheduler_common.h | 2 +- src/tbb/scheduler_utility.h | 2 +- src/tbb/semaphore.cpp | 2 +- src/tbb/semaphore.h | 2 +- src/tbb/spin_mutex.cpp | 2 +- src/tbb/spin_rw_mutex.cpp | 2 +- src/tbb/task.cpp | 2 +- src/tbb/task_group_context.cpp | 2 +- src/tbb/task_stream.h | 2 +- src/tbb/task_stream_extended.h | 2 +- src/tbb/tbb_assert_impl.h | 7 +- src/tbb/tbb_environment.h | 2 +- src/tbb/tbb_main.cpp | 2 +- src/tbb/tbb_main.h | 2 +- src/tbb/tbb_misc.cpp | 2 +- src/tbb/tbb_misc.h | 2 +- src/tbb/tbb_misc_ex.cpp | 2 +- src/tbb/tbb_resource.rc | 4 +- src/tbb/tbb_statistics.cpp | 2 +- src/tbb/tbb_statistics.h | 2 +- src/tbb/tbb_thread.cpp | 2 +- src/tbb/tbb_version.h | 2 +- src/tbb/tls.h | 2 +- src/tbb/tools_api/disable_warnings.h | 2 +- src/tbb/tools_api/ittnotify.h | 2 +- src/tbb/tools_api/ittnotify_config.h | 2 +- src/tbb/tools_api/ittnotify_static.c | 2 +- src/tbb/tools_api/ittnotify_static.h | 2 +- src/tbb/tools_api/ittnotify_types.h | 2 +- src/tbb/tools_api/legacy/ittnotify.h | 2 +- src/tbb/win32-tbb-export.def | 2 +- src/tbb/win32-tbb-export.lst | 2 +- src/tbb/win64-gcc-tbb-export.def | 2 +- src/tbb/win64-gcc-tbb-export.lst | 2 +- src/tbb/win64-tbb-export.def | 2 +- src/tbb/win64-tbb-export.lst | 2 +- src/tbb/winrt-tbb-export.lst | 2 +- src/tbb/x86_rtm_rw_mutex.cpp | 2 +- src/tbbmalloc/Customize.h | 3 +- src/tbbmalloc/MapMemory.h | 2 +- src/tbbmalloc/Statistics.h | 2 +- src/tbbmalloc/Synchronize.h | 2 +- src/tbbmalloc/TypeDefinitions.h | 2 +- src/tbbmalloc/backend.cpp | 2 +- src/tbbmalloc/backref.cpp | 2 +- src/tbbmalloc/frontend.cpp | 56 ++++++---- src/tbbmalloc/index.html | 2 +- src/tbbmalloc/large_objects.cpp | 2 +- src/tbbmalloc/lin32-proxy-export.def | 2 +- src/tbbmalloc/lin32-tbbmalloc-export.def | 3 +- src/tbbmalloc/lin64-proxy-export.def | 2 +- src/tbbmalloc/lin64-tbbmalloc-export.def | 3 +- src/tbbmalloc/lin64ipf-proxy-export.def | 2 +- src/tbbmalloc/lin64ipf-tbbmalloc-export.def | 3 +- src/tbbmalloc/mac32-tbbmalloc-export.def | 4 +- src/tbbmalloc/mac64-tbbmalloc-export.def | 4 +- src/tbbmalloc/proxy.cpp | 11 +- src/tbbmalloc/proxy.h | 2 +- src/tbbmalloc/proxy_overload_osx.h | 2 +- src/tbbmalloc/shared_utils.h | 2 +- src/tbbmalloc/tbb_function_replacement.cpp | 94 +++++++++++++++-- src/tbbmalloc/tbb_function_replacement.h | 4 +- src/tbbmalloc/tbbmalloc.cpp | 2 +- src/tbbmalloc/tbbmalloc.rc | 4 +- src/tbbmalloc/tbbmalloc_internal.h | 2 +- src/tbbmalloc/tbbmalloc_internal_api.h | 2 +- src/tbbmalloc/win32-gcc-tbbmalloc-export.def | 3 +- src/tbbmalloc/win32-tbbmalloc-export.def | 4 +- src/tbbmalloc/win64-gcc-tbbmalloc-export.def | 3 +- src/tbbmalloc/win64-tbbmalloc-export.def | 4 +- src/tbbproxy/tbbproxy-windows.asm | 2 +- src/tbbproxy/tbbproxy.cpp | 2 +- src/test/harness.h | 2 +- src/test/harness_allocator.h | 73 ++++++++++++- src/test/harness_allocator_overload.h | 2 +- src/test/harness_assert.h | 2 +- src/test/harness_bad_expr.h | 2 +- src/test/harness_barrier.h | 2 +- src/test/harness_checktype.h | 2 +- src/test/harness_concurrency.h | 2 +- src/test/harness_concurrency_tracker.h | 2 +- src/test/harness_cpu.h | 2 +- src/test/harness_defs.h | 2 +- src/test/harness_dynamic_libs.h | 2 +- src/test/harness_eh.h | 2 +- src/test/harness_fp.h | 2 +- src/test/harness_graph.h | 2 +- src/test/harness_inject_scheduler.h | 2 +- src/test/harness_iterator.h | 2 +- src/test/harness_m128.h | 2 +- src/test/harness_memory.h | 2 +- src/test/harness_mic.h | 2 +- src/test/harness_preload.h | 2 +- src/test/harness_report.h | 2 +- src/test/harness_runtime_loader.h | 2 +- src/test/harness_state_trackable.h | 2 +- src/test/harness_task.h | 2 +- src/test/harness_tbb_independence.h | 2 +- src/test/harness_test_cases_framework.h | 2 +- src/test/harness_tls.h | 2 +- src/test/harness_tsx.h | 2 +- src/test/test_ScalableAllocator.cpp | 2 +- src/test/test_ScalableAllocator_STL.cpp | 14 ++- src/test/test_aggregator.cpp | 2 +- src/test/test_aligned_space.cpp | 2 +- src/test/test_allocator.h | 2 +- src/test/test_allocator_STL.h | 21 +++- src/test/test_assembly.cpp | 2 +- src/test/test_async_msg.cpp | 2 +- src/test/test_async_node.cpp | 2 +- src/test/test_atomic.cpp | 2 +- src/test/test_blocked_range.cpp | 2 +- src/test/test_blocked_range2d.cpp | 2 +- src/test/test_blocked_range3d.cpp | 2 +- src/test/test_blocked_rangeNd.cpp | 2 +- src/test/test_broadcast_node.cpp | 2 +- src/test/test_buffer_node.cpp | 2 +- src/test/test_cache_aligned_allocator.cpp | 2 +- src/test/test_cache_aligned_allocator_STL.cpp | 13 ++- src/test/test_cilk_common.h | 2 +- src/test/test_cilk_dynamic_load.cpp | 2 +- src/test/test_cilk_interop.cpp | 2 +- src/test/test_combinable.cpp | 2 +- src/test/test_composite_node.cpp | 2 +- src/test/test_concurrent_hash_map.cpp | 76 +++++++++++++- src/test/test_concurrent_lru_cache.cpp | 2 +- src/test/test_concurrent_monitor.cpp | 2 +- src/test/test_concurrent_priority_queue.cpp | 2 +- src/test/test_concurrent_queue.cpp | 2 +- src/test/test_concurrent_queue_whitebox.cpp | 2 +- src/test/test_concurrent_unordered_common.h | 2 +- src/test/test_concurrent_unordered_map.cpp | 96 ++++++++++++++++- src/test/test_concurrent_unordered_set.cpp | 90 +++++++++++++++- src/test/test_concurrent_vector.cpp | 40 +++++++- src/test/test_condition_variable.h | 2 +- src/test/test_container_move_support.h | 5 +- src/test/test_continue_node.cpp | 2 +- src/test/test_critical_section.cpp | 2 +- src/test/test_dynamic_link.cpp | 2 +- src/test/test_eh_algorithms.cpp | 2 +- src/test/test_eh_flow_graph.cpp | 2 +- src/test/test_eh_tasks.cpp | 2 +- src/test/test_enumerable_thread_specific.cpp | 2 +- src/test/test_environment_whitebox.cpp | 2 +- src/test/test_examples_common_utility.cpp | 2 +- src/test/test_fast_random.cpp | 2 +- src/test/test_flow_graph.cpp | 2 +- src/test/test_flow_graph_priorities.cpp | 11 +- src/test/test_flow_graph_whitebox.cpp | 2 +- src/test/test_fp.cpp | 2 +- src/test/test_function_node.cpp | 2 +- src/test/test_gfx_factory.cpp | 2 +- src/test/test_global_control.cpp | 3 +- src/test/test_global_control_whitebox.cpp | 3 +- src/test/test_halt.cpp | 2 +- src/test/test_handle_perror.cpp | 2 +- src/test/test_hw_concurrency.cpp | 2 +- src/test/test_indexer_node.cpp | 2 +- src/test/test_initializer_list.h | 2 +- src/test/test_inits_loop.cpp | 2 +- src/test/test_intrusive_list.cpp | 2 +- src/test/test_iterators.cpp | 25 ++++- src/test/test_ittnotify.cpp | 2 +- src/test/test_join_node.cpp | 2 +- src/test/test_join_node.h | 2 +- src/test/test_join_node_key_matching.cpp | 2 +- src/test/test_join_node_msg_key_matching.cpp | 2 +- src/test/test_lambda.cpp | 2 +- src/test/test_limiter_node.cpp | 2 +- src/test/test_malloc_atexit.cpp | 2 +- src/test/test_malloc_compliance.cpp | 2 +- src/test/test_malloc_init_shutdown.cpp | 2 +- src/test/test_malloc_lib_unload.cpp | 2 +- src/test/test_malloc_new_handler.cpp | 2 +- src/test/test_malloc_overload.cpp | 40 +++++++- src/test/test_malloc_overload_disable.cpp | 2 +- src/test/test_malloc_pools.cpp | 24 ++++- src/test/test_malloc_pure_c.c | 2 +- src/test/test_malloc_regression.cpp | 2 +- src/test/test_malloc_shutdown_hang.cpp | 2 +- src/test/test_malloc_used_by_lib.cpp | 2 +- src/test/test_malloc_whitebox.cpp | 58 ++++++++++- src/test/test_model_plugin.cpp | 2 +- src/test/test_multifunction_node.cpp | 2 +- src/test/test_mutex.cpp | 2 +- src/test/test_mutex_native_threads.cpp | 2 +- src/test/test_opencl_node.cl | 2 +- src/test/test_opencl_node.cpp | 2 +- src/test/test_openmp.cpp | 2 +- src/test/test_overwrite_node.cpp | 2 +- src/test/test_parallel_do.cpp | 2 +- src/test/test_parallel_for.cpp | 2 +- src/test/test_parallel_for_each.cpp | 2 +- src/test/test_parallel_for_vectorization.cpp | 2 +- src/test/test_parallel_invoke.cpp | 2 +- src/test/test_parallel_pipeline.cpp | 2 +- src/test/test_parallel_reduce.cpp | 2 +- src/test/test_parallel_scan.cpp | 2 +- src/test/test_parallel_sort.cpp | 2 +- src/test/test_parallel_while.cpp | 2 +- src/test/test_partitioner.h | 2 +- src/test/test_partitioner_whitebox.cpp | 2 +- src/test/test_partitioner_whitebox.h | 2 +- src/test/test_pipeline.cpp | 2 +- src/test/test_pipeline_with_tbf.cpp | 2 +- src/test/test_priority_queue_node.cpp | 2 +- src/test/test_queue_node.cpp | 2 +- src/test/test_range_based_for.h | 2 +- src/test/test_reader_writer_lock.cpp | 2 +- src/test/test_runtime_loader.cpp | 2 +- src/test/test_rwm_upgrade_downgrade.cpp | 2 +- src/test/test_semaphore.cpp | 2 +- src/test/test_sequencer_node.cpp | 2 +- src/test/test_source_node.cpp | 2 +- src/test/test_split_node.cpp | 2 +- src/test/test_static_assert.cpp | 2 +- src/test/test_std_thread.cpp | 2 +- src/test/test_streaming_node.cpp | 2 +- src/test/test_tagged_msg.cpp | 2 +- src/test/test_task.cpp | 2 +- src/test/test_task_arena.cpp | 4 +- src/test/test_task_assertions.cpp | 2 +- src/test/test_task_auto_init.cpp | 2 +- src/test/test_task_enqueue.cpp | 3 +- src/test/test_task_group.cpp | 2 +- src/test/test_task_leaks.cpp | 2 +- src/test/test_task_priority.cpp | 3 +- src/test/test_task_scheduler_init.cpp | 2 +- src/test/test_task_scheduler_observer.cpp | 2 +- src/test/test_task_steal_limit.cpp | 2 +- src/test/test_tbb_condition_variable.cpp | 2 +- src/test/test_tbb_fork.cpp | 2 +- src/test/test_tbb_header.cpp | 5 +- src/test/test_tbb_thread.cpp | 2 +- src/test/test_tbb_version.cpp | 4 +- src/test/test_thread.h | 2 +- src/test/test_tick_count.cpp | 2 +- src/test/test_tuple.cpp | 2 +- src/test/test_write_once_node.cpp | 2 +- src/test/test_yield.cpp | 2 +- 868 files changed, 2356 insertions(+), 1045 deletions(-) create mode 100644 examples/graph/cholesky/xcode/cholesky.xcodeproj/xcshareddata/xcschemes/Cholesky.xcscheme create mode 100644 include/tbb/internal/_allocator_traits.h diff --git a/CHANGES b/CHANGES index 2a02117..7e791f2 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,42 @@ The list of most significant changes made over time in Intel(R) Threading Building Blocks (Intel(R) TBB). +Intel TBB 2019 Update 4 +TBB_INTERFACE_VERSION == 11004 + +Changes (w.r.t. Intel TBB 2019 Update 3): + +- global_control class is now a fully supported feature. +- Added deduction guides for tbb containers: concurrent_hash_map, + concurrent_unordered_map, concurrent_unordered_set. +- Added tbb::scalable_memory_resource function returning + std::pmr::memory_resource interface to the TBB memory allocator. +- Added tbb::cache_aligned_resource class that implements + std::pmr::memory_resource with cache alignment and no false sharing. +- Added rml::pool_msize function returning the usable size of a memory + block allocated from a given memory pool. +- Added default and copy constructors for tbb::counting_iterator + and tbb::zip_iterator. +- Added TBB_malloc_replacement_log function to obtain the status of + dynamic memory allocation replacement (Windows* only). +- CMake configuration file now supports release-only and debug-only + configurations (https://github.com/01org/tbb/issues/113). +- TBBBuild CMake module takes the C++ version from CMAKE_CXX_STANDARD. + +Bugs fixed: + +- Fixed compilation for tbb::concurrent_vector when used with + std::pmr::polymorphic_allocator. + +Open-source contributions integrated: + +- TBB_INTERFACE_VERSION is included into TBB version in CMake + configuration (https://github.com/01org/tbb/pull/100) + by Hans Johnson. +- Fixed detection of C++17 deduction guides for Visual C++* + (https://github.com/01org/tbb/pull/112) by Marian Klymov. + +------------------------------------------------------------------------ Intel TBB 2019 Update 3 TBB_INTERFACE_VERSION == 11003 @@ -120,6 +156,17 @@ Open-source contributions integrated: - Added support for OpenBSD by Anthony J. Bentley. ------------------------------------------------------------------------ +Intel TBB 2018 Update 6 +TBB_INTERFACE_VERSION == 10006 + +Changes (w.r.t. Intel TBB 2018 Update 5): + +Bugs fixed: + +- Fixed an issue with dynamic memory allocation replacement on Windows* + occurred for some versions of ucrtbase.dll. + +------------------------------------------------------------------------ Intel TBB 2018 Update 5 TBB_INTERFACE_VERSION == 10005 diff --git a/Makefile b/Makefile index 0f7d30d..8dea398 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 8189669..ea92310 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Threading Building Blocks 2019 Update 3 -[![Stable release](https://img.shields.io/badge/version-2019_U3-green.svg)](https://github.com/01org/tbb/releases/tag/2019_U3) +# Threading Building Blocks 2019 Update 4 +[![Stable release](https://img.shields.io/badge/version-2019_U4-green.svg)](https://github.com/01org/tbb/releases/tag/2019_U4) [![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE) Threading Building Blocks (TBB) lets you easily write parallel C++ programs that take diff --git a/build/AIX.gcc.inc b/build/AIX.gcc.inc index 5adcd41..7dcd308 100644 --- a/build/AIX.gcc.inc +++ b/build/AIX.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/AIX.inc b/build/AIX.inc index e279a4d..901f15e 100644 --- a/build/AIX.inc +++ b/build/AIX.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/BSD.clang.inc b/build/BSD.clang.inc index fc13406..c35856b 100644 --- a/build/BSD.clang.inc +++ b/build/BSD.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/BSD.inc b/build/BSD.inc index 0ba2135..e1d35e9 100644 --- a/build/BSD.inc +++ b/build/BSD.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/FreeBSD.clang.inc b/build/FreeBSD.clang.inc index aae9964..03cb462 100644 --- a/build/FreeBSD.clang.inc +++ b/build/FreeBSD.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc index 1c8ff5f..89a8013 100644 --- a/build/FreeBSD.gcc.inc +++ b/build/FreeBSD.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/FreeBSD.inc b/build/FreeBSD.inc index 91bebc9..3bfa35e 100644 --- a/build/FreeBSD.inc +++ b/build/FreeBSD.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/Makefile.rml b/build/Makefile.rml index e3150e3..253148b 100644 --- a/build/Makefile.rml +++ b/build/Makefile.rml @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/Makefile.tbb b/build/Makefile.tbb index 0ddf460..f655da6 100644 --- a/build/Makefile.tbb +++ b/build/Makefile.tbb @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/Makefile.tbbmalloc b/build/Makefile.tbbmalloc index c147568..7b102dc 100644 --- a/build/Makefile.tbbmalloc +++ b/build/Makefile.tbbmalloc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/Makefile.tbbproxy b/build/Makefile.tbbproxy index eae6c9f..b4cea5a 100644 --- a/build/Makefile.tbbproxy +++ b/build/Makefile.tbbproxy @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/Makefile.test b/build/Makefile.test index 8e38d36..ad72ede 100644 --- a/build/Makefile.test +++ b/build/Makefile.test @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/OpenBSD.clang.inc b/build/OpenBSD.clang.inc index 8d7bf85..1e726c2 100644 --- a/build/OpenBSD.clang.inc +++ b/build/OpenBSD.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/OpenBSD.inc b/build/OpenBSD.inc index 91bebc9..3bfa35e 100644 --- a/build/OpenBSD.inc +++ b/build/OpenBSD.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/SunOS.gcc.inc b/build/SunOS.gcc.inc index 1e8dcf4..1b857f4 100644 --- a/build/SunOS.gcc.inc +++ b/build/SunOS.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/SunOS.inc b/build/SunOS.inc index 95b1735..625e6d3 100644 --- a/build/SunOS.inc +++ b/build/SunOS.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/SunOS.suncc.inc b/build/SunOS.suncc.inc index b1fda77..502fe13 100644 --- a/build/SunOS.suncc.inc +++ b/build/SunOS.suncc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.clang.inc b/build/android.clang.inc index 4f9ef31..731568f 100644 --- a/build/android.clang.inc +++ b/build/android.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.gcc.inc b/build/android.gcc.inc index a90d587..0c556dd 100644 --- a/build/android.gcc.inc +++ b/build/android.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.icc.inc b/build/android.icc.inc index 3909b38..b624c25 100644 --- a/build/android.icc.inc +++ b/build/android.icc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.inc b/build/android.inc index c0232b0..4f53866 100644 --- a/build/android.inc +++ b/build/android.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.linux.inc b/build/android.linux.inc index c95e5e3..12c905d 100644 --- a/build/android.linux.inc +++ b/build/android.linux.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.linux.launcher.sh b/build/android.linux.launcher.sh index 919bc49..e0a9d78 100644 --- a/build/android.linux.launcher.sh +++ b/build/android.linux.launcher.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.macos.inc b/build/android.macos.inc index 8b1c7ae..6934601 100644 --- a/build/android.macos.inc +++ b/build/android.macos.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/android.windows.inc b/build/android.windows.inc index 01b1d90..1d7fb07 100644 --- a/build/android.windows.inc +++ b/build/android.windows.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/big_iron.inc b/build/big_iron.inc index ad1b4fb..6ad8e96 100644 --- a/build/big_iron.inc +++ b/build/big_iron.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build.py b/build/build.py index 53796a9..77c685d 100644 --- a/build/build.py +++ b/build/build.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/common.inc b/build/common.inc index cef75df..2356648 100644 --- a/build/common.inc +++ b/build/common.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/common_rules.inc b/build/common_rules.inc index 6bb2e7a..a0207c2 100644 --- a/build/common_rules.inc +++ b/build/common_rules.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/detect.js b/build/detect.js index 45d6b4b..96f768a 100644 --- a/build/detect.js +++ b/build/detect.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/build/generate_tbbvars.bat b/build/generate_tbbvars.bat index a7bee90..c8bdfab 100644 --- a/build/generate_tbbvars.bat +++ b/build/generate_tbbvars.bat @@ -1,6 +1,6 @@ @echo off REM -REM Copyright (c) 2005-2018 Intel Corporation +REM Copyright (c) 2005-2019 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. diff --git a/build/generate_tbbvars.sh b/build/generate_tbbvars.sh index 4dd9c2c..3f2dd06 100644 --- a/build/generate_tbbvars.sh +++ b/build/generate_tbbvars.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/index.html b/build/index.html index 57f41d8..ae04769 100644 --- a/build/index.html +++ b/build/index.html @@ -233,7 +233,7 @@ See the Makefile infrastructure files for examples.
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel, the Intel logo and Itanium are trademarks of Intel Corporation or its subsidiaries in the U.S. and/or other countries.

diff --git a/build/ios.clang.inc b/build/ios.clang.inc index 6c81042..0e1da2e 100644 --- a/build/ios.clang.inc +++ b/build/ios.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,3 @@ # include $(tbb_root)/build/macos.clang.inc - -CPLUS_FLAGS += -miphoneos-version-min=8.0 -LINK_FLAGS += -miphoneos-version-min=8.0 -LIB_LINK_FLAGS += -miphoneos-version-min=8.0 diff --git a/build/ios.macos.inc b/build/ios.macos.inc index 03308a0..690d556 100644 --- a/build/ios.macos.inc +++ b/build/ios.macos.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,3 +34,5 @@ endif ios_version:=$(shell echo $(SDKROOT) | sed -e "s/.*[a-z,A-Z]\(.*\).sdk/\1/") runtime:=cc$(clang_version)_ios$(ios_version) + +IPHONEOS_DEPLOYMENT_TARGET ?= 8.0 diff --git a/build/linux.clang.inc b/build/linux.clang.inc index 065f1d3..39222f8 100644 --- a/build/linux.clang.inc +++ b/build/linux.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc index 3693676..cab65af 100644 --- a/build/linux.gcc.inc +++ b/build/linux.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/linux.icc.inc b/build/linux.icc.inc index 4731f96..0d6121f 100644 --- a/build/linux.icc.inc +++ b/build/linux.icc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/linux.inc b/build/linux.inc index 8e58f1e..fd0ca30 100644 --- a/build/linux.inc +++ b/build/linux.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/linux.pathcc.inc b/build/linux.pathcc.inc index d2693c1..1bdc15f 100644 --- a/build/linux.pathcc.inc +++ b/build/linux.pathcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/linux.xl.inc b/build/linux.xl.inc index dcec5a6..22580e7 100644 --- a/build/linux.xl.inc +++ b/build/linux.xl.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/macos.clang.inc b/build/macos.clang.inc index 23a4288..b46a9da 100644 --- a/build/macos.clang.inc +++ b/build/macos.clang.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -94,6 +94,16 @@ ifdef SDKROOT LIB_LINK_FLAGS += -L$(SDKROOT)/usr/lib/system -L$(SDKROOT)/usr/lib/ endif +ifeq (ios,$(target)) + CPLUS_FLAGS += -miphoneos-version-min=$(IPHONEOS_DEPLOYMENT_TARGET) + LINK_FLAGS += -miphoneos-version-min=$(IPHONEOS_DEPLOYMENT_TARGET) + LIB_LINK_FLAGS += -miphoneos-version-min=$(IPHONEOS_DEPLOYMENT_TARGET) +else + CPLUS_FLAGS += -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) + LINK_FLAGS += -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) + LIB_LINK_FLAGS += -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) +endif + #------------------------------------------------------------------------------ # Setting assembler data. #------------------------------------------------------------------------------ diff --git a/build/macos.gcc.inc b/build/macos.gcc.inc index 5df569d..9fea5e4 100644 --- a/build/macos.gcc.inc +++ b/build/macos.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/macos.icc.inc b/build/macos.icc.inc index aa7d332..0598f00 100644 --- a/build/macos.icc.inc +++ b/build/macos.icc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -66,7 +66,6 @@ ifneq (,$(codecov)) endif # ICC 14.0 and higher support usage of libc++, clang standard library -MACOSX_DEPLOYMENT_TARGET ?= 10.11 ifneq (,$(shell icc -dumpversion | egrep "^1[4-9]\.")) ifneq (,$(stdlib)) CPLUS_FLAGS += -stdlib=$(stdlib) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) diff --git a/build/macos.inc b/build/macos.inc index c219e57..51d502a 100644 --- a/build/macos.inc +++ b/build/macos.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -105,3 +105,5 @@ LINK_MALLOCPROXY.LIB = $(MALLOCPROXY.LIB) TEST_LAUNCHER=sh $(tbb_root)/build/test_launcher.sh $(largs) OPENCL.LIB = -framework OpenCL + +MACOSX_DEPLOYMENT_TARGET ?= 10.11 diff --git a/build/mic.icc.inc b/build/mic.icc.inc index f91519a..1ef3454 100644 --- a/build/mic.icc.inc +++ b/build/mic.icc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/mic.linux.inc b/build/mic.linux.inc index bb1e81a..3185e94 100644 --- a/build/mic.linux.inc +++ b/build/mic.linux.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/mic.linux.launcher.sh b/build/mic.linux.launcher.sh index 60e01b7..2f3cfc9 100644 --- a/build/mic.linux.launcher.sh +++ b/build/mic.linux.launcher.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/mic.offload.inc b/build/mic.offload.inc index e2b0971..7b2bc4d 100644 --- a/build/mic.offload.inc +++ b/build/mic.offload.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/test_launcher.bat b/build/test_launcher.bat index 8e1fb31..06c5598 100644 --- a/build/test_launcher.bat +++ b/build/test_launcher.bat @@ -1,6 +1,6 @@ @echo off REM -REM Copyright (c) 2005-2018 Intel Corporation +REM Copyright (c) 2005-2019 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. diff --git a/build/test_launcher.sh b/build/test_launcher.sh index 8df4c14..8becd65 100644 --- a/build/test_launcher.sh +++ b/build/test_launcher.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/version_info_aix.sh b/build/version_info_aix.sh index 7703f4c..e1397f9 100644 --- a/build/version_info_aix.sh +++ b/build/version_info_aix.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/version_info_android.sh b/build/version_info_android.sh index ba8211a..647b360 100644 --- a/build/version_info_android.sh +++ b/build/version_info_android.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/version_info_linux.sh b/build/version_info_linux.sh index 7703f4c..e1397f9 100644 --- a/build/version_info_linux.sh +++ b/build/version_info_linux.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/version_info_macos.sh b/build/version_info_macos.sh index 2fcfc07..07cc225 100644 --- a/build/version_info_macos.sh +++ b/build/version_info_macos.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/version_info_sunos.sh b/build/version_info_sunos.sh index 885bcc4..c9260d5 100644 --- a/build/version_info_sunos.sh +++ b/build/version_info_sunos.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/version_info_windows.js b/build/version_info_windows.js index 031b22c..3cfa19e 100644 --- a/build/version_info_windows.js +++ b/build/version_info_windows.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/build/vs2013/index.html b/build/vs2013/index.html index 1146654..40b85f3 100644 --- a/build/vs2013/index.html +++ b/build/vs2013/index.html @@ -20,7 +20,7 @@ This directory contains the Visual Studio* 2013 solution to build Intel® Thr
Up to parent directory

-Copyright © 2018 Intel Corporation. All Rights Reserved. +Copyright © 2017-2019 Intel Corporation. All Rights Reserved.

Intel and the Intel logo are trademarks of Intel Corporation or its subsidiaries in the U.S. and/or other countries. diff --git a/build/windows.cl.inc b/build/windows.cl.inc index 97909cf..55c21a8 100644 --- a/build/windows.cl.inc +++ b/build/windows.cl.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/windows.gcc.inc b/build/windows.gcc.inc index 90a956a..ad13763 100644 --- a/build/windows.gcc.inc +++ b/build/windows.gcc.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/windows.icl.inc b/build/windows.icl.inc index 8fc8cdf..89889e3 100644 --- a/build/windows.icl.inc +++ b/build/windows.icl.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/windows.inc b/build/windows.inc index 891bf94..19eaf41 100644 --- a/build/windows.inc +++ b/build/windows.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cmake/README.rst b/cmake/README.rst index 40befbf..17480d5 100644 --- a/cmake/README.rst +++ b/cmake/README.rst @@ -30,7 +30,7 @@ Visit our `forum `_ has restricted functionality: compatibility of update numbers (as well as interface versions) is not checked. Supported versioning: ``find_package(TBB . ...)``. Intel TBB interface version can be obtained in the customer project via the ``TBB_INTERFACE_VERSION`` variable. +* Intel TBB versioning via `find_package `_ has the following format: ``find_package(TBB .. ...)``. Intel TBB interface version can also be obtained in the customer project via the ``TBB_INTERFACE_VERSION`` variable. Use cases of Intel TBB integration into CMake-aware projects ------------------------------------------------------------ diff --git a/cmake/TBBBuild.cmake b/cmake/TBBBuild.cmake index 14f8517..d106c53 100644 --- a/cmake/TBBBuild.cmake +++ b/cmake/TBBBuild.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ # # Usage: # include(TBBBuild.cmake) -# tbb_build(ROOT MAKE_ARGS [... ]) +# tbb_build(TBB_ROOT CONFIG_DIR MAKE_ARGS [... ]) # find_package(TBB ) # @@ -78,6 +78,10 @@ function(tbb_build) set(result "compiler=${compiler}" ${result}) endif() + if (NOT tbb_GMA_USER_DEFINED_ARGS MATCHES "stdver=" AND DEFINED CMAKE_CXX_STANDARD) + set(result "stdver=c++${CMAKE_CXX_STANDARD}" ${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() diff --git a/cmake/TBBGet.cmake b/cmake/TBBGet.cmake index 5cb93af..1ce80f6 100644 --- a/cmake/TBBGet.cmake +++ b/cmake/TBBGet.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cmake/TBBMakeConfig.cmake b/cmake/TBBMakeConfig.cmake index 54fc7c6..d4dd515 100644 --- a/cmake/TBBMakeConfig.cmake +++ b/cmake/TBBMakeConfig.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ 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'\") + message(FATAL_ERROR \"This Intel TBB package is intended to be used only in environment with available 'gcc'\") endif() unset(_tbb_gcc_ver_output) endif() @@ -123,10 +123,8 @@ endif()") 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\"") + set(TBB_IMPLIB_RELEASE "\nIMPORTED_IMPLIB_RELEASE \"\${_tbb_root}/lib/\${_tbb_arch_subdir}/\${_tbb_compiler_subdir}/\${_tbb_component}.lib\"") + set(TBB_IMPLIB_DEBUG "\nIMPORTED_IMPLIB_DEBUG \"\${_tbb_root}/lib/\${_tbb_arch_subdir}/\${_tbb_compiler_subdir}/\${_tbb_component}_debug.lib\"") endif() # Note: multiline variable @@ -155,7 +153,7 @@ endif()") 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}") + set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}.${TBB_INTERFACE_VERSION}") if (tbb_MK_CONFIG_FOR_SOURCE) set(_tbb_config_template TBBConfigForSource.cmake.in) diff --git a/cmake/tbb_config_generator.cmake b/cmake/tbb_config_generator.cmake index 5c38aaa..5748f76 100644 --- a/cmake/tbb_config_generator.cmake +++ b/cmake/tbb_config_generator.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cmake/templates/TBBConfig.cmake.in b/cmake/templates/TBBConfig.cmake.in index 9094343..d12cff6 100644 --- a/cmake/templates/TBBConfig.cmake.in +++ b/cmake/templates/TBBConfig.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -58,13 +58,23 @@ 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}") + if (EXISTS "${_tbb_release_lib}" OR 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@) + 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) diff --git a/cmake/templates/TBBConfigForSource.cmake.in b/cmake/templates/TBBConfigForSource.cmake.in index 2bccdd9..bb1b308 100644 --- a/cmake/templates/TBBConfigForSource.cmake.in +++ b/cmake/templates/TBBConfigForSource.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cmake/templates/TBBConfigVersion.cmake.in b/cmake/templates/TBBConfigVersion.cmake.in index f587af2..19268bb 100644 --- a/cmake/templates/TBBConfigVersion.cmake.in +++ b/cmake/templates/TBBConfigVersion.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/doc/Release_Notes.txt b/doc/Release_Notes.txt index aba73d9..c27aa0b 100644 --- a/doc/Release_Notes.txt +++ b/doc/Release_Notes.txt @@ -91,6 +91,7 @@ Software - Supported Compilers version provided with that operating system is supported GNU Compilers (gcc) 4.1 - 7.1 GNU C Library (glibc) version 2.4 - 2.19 + Clang* 3.8 - 7.0 Xcode* 7.0 - 9.1 Android* NDK r10e - r17b @@ -120,7 +121,7 @@ Library Issues with each other directly. ------------------------------------------------------------------------ -(C) 2018 Intel Corporation +(C) 2019 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 diff --git a/doc/copyright_brand_disclaimer_doxygen.txt b/doc/copyright_brand_disclaimer_doxygen.txt index 7ba446b..5a51272 100644 --- a/doc/copyright_brand_disclaimer_doxygen.txt +++ b/doc/copyright_brand_disclaimer_doxygen.txt @@ -1,6 +1,6 @@

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel, Pentium, Intel Xeon, Itanium, Intel XScale and VTune are registered trademarks or trademarks of Intel Corporation or its diff --git a/examples/GettingStarted/index.html b/examples/GettingStarted/index.html index ee3e985..003947d 100644 --- a/examples/GettingStarted/index.html +++ b/examples/GettingStarted/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/GettingStarted/sub_string_finder/Makefile b/examples/GettingStarted/sub_string_finder/Makefile index cb97400..873b1b6 100644 --- a/examples/GettingStarted/sub_string_finder/Makefile +++ b/examples/GettingStarted/sub_string_finder/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/GettingStarted/sub_string_finder/Makefile.windows b/examples/GettingStarted/sub_string_finder/Makefile.windows index cc49a39..5689d58 100644 --- a/examples/GettingStarted/sub_string_finder/Makefile.windows +++ b/examples/GettingStarted/sub_string_finder/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/GettingStarted/sub_string_finder/readme.html b/examples/GettingStarted/sub_string_finder/readme.html index 7afbed8..6e7da31 100644 --- a/examples/GettingStarted/sub_string_finder/readme.html +++ b/examples/GettingStarted/sub_string_finder/readme.html @@ -407,7 +407,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/GettingStarted/sub_string_finder/sub_string_finder.cpp b/examples/GettingStarted/sub_string_finder/sub_string_finder.cpp index 9274c47..abad2ee 100644 --- a/examples/GettingStarted/sub_string_finder/sub_string_finder.cpp +++ b/examples/GettingStarted/sub_string_finder/sub_string_finder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/GettingStarted/sub_string_finder/sub_string_finder_extended.cpp b/examples/GettingStarted/sub_string_finder/sub_string_finder_extended.cpp index 6f255b0..be836f9 100644 --- a/examples/GettingStarted/sub_string_finder/sub_string_finder_extended.cpp +++ b/examples/GettingStarted/sub_string_finder/sub_string_finder_extended.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/GettingStarted/sub_string_finder/sub_string_finder_pretty.cpp b/examples/GettingStarted/sub_string_finder/sub_string_finder_pretty.cpp index 067d281..08c7331 100644 --- a/examples/GettingStarted/sub_string_finder/sub_string_finder_pretty.cpp +++ b/examples/GettingStarted/sub_string_finder/sub_string_finder_pretty.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/GettingStarted/sub_string_finder/xcode/sub_string_finder.xcodeproj/project.pbxproj b/examples/GettingStarted/sub_string_finder/xcode/sub_string_finder.xcodeproj/project.pbxproj index 9ff1086..901f5a9 100644 --- a/examples/GettingStarted/sub_string_finder/xcode/sub_string_finder.xcodeproj/project.pbxproj +++ b/examples/GettingStarted/sub_string_finder/xcode/sub_string_finder.xcodeproj/project.pbxproj @@ -467,7 +467,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "sub_string_finder" */ = { isa = XCConfigurationList; @@ -476,7 +476,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; A1F5940C0B8F1DB600073279 /* Build configuration list for PBXNativeTarget "sub_string_finder_pretty" */ = { isa = XCConfigurationList; @@ -485,7 +485,7 @@ A1F594100B8F1DB600073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; A1F5941F0B8F1F4E00073279 /* Build configuration list for PBXNativeTarget "sub_string_finder_extended" */ = { isa = XCConfigurationList; @@ -494,7 +494,7 @@ A1F594230B8F1F4E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/Makefile b/examples/Makefile index 3594be3..f18369a 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/common/copy_libraries.bat b/examples/common/copy_libraries.bat index 87c4a59..bef7f7e 100644 --- a/examples/common/copy_libraries.bat +++ b/examples/common/copy_libraries.bat @@ -1,6 +1,6 @@ @echo off REM -REM Copyright (c) 2005-2018 Intel Corporation +REM Copyright (c) 2005-2019 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. diff --git a/examples/common/examples-common.inc b/examples/common/examples-common.inc index 3417a92..52d4087 100644 --- a/examples/common/examples-common.inc +++ b/examples/common/examples-common.inc @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/common/gui/Makefile.gmake b/examples/common/gui/Makefile.gmake index c4aeb82..1c3e871 100644 --- a/examples/common/gui/Makefile.gmake +++ b/examples/common/gui/Makefile.gmake @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/common/gui/Makefile.win b/examples/common/gui/Makefile.win index fb0e4a6..3f8efc4 100644 --- a/examples/common/gui/Makefile.win +++ b/examples/common/gui/Makefile.win @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/common/gui/convideo.cpp b/examples/common/gui/convideo.cpp index 18d1096..5117125 100644 --- a/examples/common/gui/convideo.cpp +++ b/examples/common/gui/convideo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/d2dvideo.cpp b/examples/common/gui/d2dvideo.cpp index 0ca7766..e557bda 100644 --- a/examples/common/gui/d2dvideo.cpp +++ b/examples/common/gui/d2dvideo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/dxcheck.bat b/examples/common/gui/dxcheck.bat index 281bc6f..8a32687 100644 --- a/examples/common/gui/dxcheck.bat +++ b/examples/common/gui/dxcheck.bat @@ -1,6 +1,6 @@ @echo off REM -REM Copyright (c) 2005-2018 Intel Corporation +REM Copyright (c) 2005-2019 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. diff --git a/examples/common/gui/gdivideo.cpp b/examples/common/gui/gdivideo.cpp index 3e40176..a5150f3 100644 --- a/examples/common/gui/gdivideo.cpp +++ b/examples/common/gui/gdivideo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/macvideo.cpp b/examples/common/gui/macvideo.cpp index a35ccb7..55f0037 100644 --- a/examples/common/gui/macvideo.cpp +++ b/examples/common/gui/macvideo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/video.h b/examples/common/gui/video.h index db347e0..905a1c0 100644 --- a/examples/common/gui/video.h +++ b/examples/common/gui/video.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/winvideo.h b/examples/common/gui/winvideo.h index c5ae8a3..5b45778 100644 --- a/examples/common/gui/winvideo.h +++ b/examples/common/gui/winvideo.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xcode/tbbExample/OpenGLView.h b/examples/common/gui/xcode/tbbExample/OpenGLView.h index 81e1995..9cc91c2 100644 --- a/examples/common/gui/xcode/tbbExample/OpenGLView.h +++ b/examples/common/gui/xcode/tbbExample/OpenGLView.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xcode/tbbExample/OpenGLView.m b/examples/common/gui/xcode/tbbExample/OpenGLView.m index 096db8a..39e9650 100644 --- a/examples/common/gui/xcode/tbbExample/OpenGLView.m +++ b/examples/common/gui/xcode/tbbExample/OpenGLView.m @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xcode/tbbExample/main.m b/examples/common/gui/xcode/tbbExample/main.m index 5b87395..7133dbb 100644 --- a/examples/common/gui/xcode/tbbExample/main.m +++ b/examples/common/gui/xcode/tbbExample/main.m @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h b/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h index 4bd0881..11f7bfd 100644 --- a/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h +++ b/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m b/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m index 266c1a4..2835009 100644 --- a/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m +++ b/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xcode/tbbExample/tbbExample-Info.plist b/examples/common/gui/xcode/tbbExample/tbbExample-Info.plist index c344a91..227c9f4 100644 --- a/examples/common/gui/xcode/tbbExample/tbbExample-Info.plist +++ b/examples/common/gui/xcode/tbbExample/tbbExample-Info.plist @@ -36,7 +36,7 @@ LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright 2005-2018 Intel Corporation. All Rights Reserved. + Copyright 2005-2019 Intel Corporation. All Rights Reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/examples/common/gui/xcode/tbbExample/tbbExample-Prefix.pch b/examples/common/gui/xcode/tbbExample/tbbExample-Prefix.pch index 4531cbe..5262d94 100644 --- a/examples/common/gui/xcode/tbbExample/tbbExample-Prefix.pch +++ b/examples/common/gui/xcode/tbbExample/tbbExample-Prefix.pch @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/gui/xvideo.cpp b/examples/common/gui/xvideo.cpp index 8f5ce23..a1b2476 100644 --- a/examples/common/gui/xvideo.cpp +++ b/examples/common/gui/xvideo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/index.html b/examples/common/index.html index 6e9398a..2535857 100644 --- a/examples/common/index.html +++ b/examples/common/index.html @@ -389,7 +389,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/common/utility/fast_random.h b/examples/common/utility/fast_random.h index 7ca97a2..408b16d 100644 --- a/examples/common/utility/fast_random.h +++ b/examples/common/utility/fast_random.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/common/utility/utility.h b/examples/common/utility/utility.h index 0f8475e..89256fc 100644 --- a/examples/common/utility/utility.h +++ b/examples/common/utility/utility.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/concurrent_hash_map/count_strings/Makefile b/examples/concurrent_hash_map/count_strings/Makefile index f6630b5..df419b1 100644 --- a/examples/concurrent_hash_map/count_strings/Makefile +++ b/examples/concurrent_hash_map/count_strings/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/concurrent_hash_map/count_strings/Makefile.windows b/examples/concurrent_hash_map/count_strings/Makefile.windows index 871cfd5..42140b4 100644 --- a/examples/concurrent_hash_map/count_strings/Makefile.windows +++ b/examples/concurrent_hash_map/count_strings/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/concurrent_hash_map/count_strings/count_strings.cpp b/examples/concurrent_hash_map/count_strings/count_strings.cpp index 779ac7d..52f7746 100644 --- a/examples/concurrent_hash_map/count_strings/count_strings.cpp +++ b/examples/concurrent_hash_map/count_strings/count_strings.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/concurrent_hash_map/count_strings/readme.html b/examples/concurrent_hash_map/count_strings/readme.html index 9ed9d93..07268e4 100644 --- a/examples/concurrent_hash_map/count_strings/readme.html +++ b/examples/concurrent_hash_map/count_strings/readme.html @@ -392,7 +392,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/concurrent_hash_map/count_strings/xcode/count_strings.xcodeproj/project.pbxproj b/examples/concurrent_hash_map/count_strings/xcode/count_strings.xcodeproj/project.pbxproj index 44900a5..120146d 100644 --- a/examples/concurrent_hash_map/count_strings/xcode/count_strings.xcodeproj/project.pbxproj +++ b/examples/concurrent_hash_map/count_strings/xcode/count_strings.xcodeproj/project.pbxproj @@ -293,7 +293,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "count_strings" */ = { isa = XCConfigurationList; @@ -302,7 +302,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/concurrent_hash_map/index.html b/examples/concurrent_hash_map/index.html index 78521f7..6972218 100644 --- a/examples/concurrent_hash_map/index.html +++ b/examples/concurrent_hash_map/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/concurrent_priority_queue/index.html b/examples/concurrent_priority_queue/index.html index 6e769e3..a508779 100644 --- a/examples/concurrent_priority_queue/index.html +++ b/examples/concurrent_priority_queue/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/concurrent_priority_queue/shortpath/Makefile b/examples/concurrent_priority_queue/shortpath/Makefile index 6aa7e91..ee57905 100644 --- a/examples/concurrent_priority_queue/shortpath/Makefile +++ b/examples/concurrent_priority_queue/shortpath/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/concurrent_priority_queue/shortpath/Makefile.windows b/examples/concurrent_priority_queue/shortpath/Makefile.windows index be78d4c..5d25813 100644 --- a/examples/concurrent_priority_queue/shortpath/Makefile.windows +++ b/examples/concurrent_priority_queue/shortpath/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/concurrent_priority_queue/shortpath/readme.html b/examples/concurrent_priority_queue/shortpath/readme.html index dd730e8..eca34d5 100644 --- a/examples/concurrent_priority_queue/shortpath/readme.html +++ b/examples/concurrent_priority_queue/shortpath/readme.html @@ -418,7 +418,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/concurrent_priority_queue/shortpath/shortpath.cpp b/examples/concurrent_priority_queue/shortpath/shortpath.cpp index 0d380c8..1108101 100644 --- a/examples/concurrent_priority_queue/shortpath/shortpath.cpp +++ b/examples/concurrent_priority_queue/shortpath/shortpath.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/concurrent_priority_queue/shortpath/xcode/shortpath.xcodeproj/project.pbxproj b/examples/concurrent_priority_queue/shortpath/xcode/shortpath.xcodeproj/project.pbxproj index 4b26fb1..1af55b1 100644 --- a/examples/concurrent_priority_queue/shortpath/xcode/shortpath.xcodeproj/project.pbxproj +++ b/examples/concurrent_priority_queue/shortpath/xcode/shortpath.xcodeproj/project.pbxproj @@ -291,7 +291,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "shortpath" */ = { isa = XCConfigurationList; @@ -300,7 +300,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/graph/binpack/Makefile b/examples/graph/binpack/Makefile index e794596..2d19817 100644 --- a/examples/graph/binpack/Makefile +++ b/examples/graph/binpack/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/binpack/Makefile.windows b/examples/graph/binpack/Makefile.windows index ebab52d..e87c320 100644 --- a/examples/graph/binpack/Makefile.windows +++ b/examples/graph/binpack/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/binpack/binpack.cpp b/examples/graph/binpack/binpack.cpp index 944e207..4ca2849 100644 --- a/examples/graph/binpack/binpack.cpp +++ b/examples/graph/binpack/binpack.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/binpack/readme.html b/examples/graph/binpack/readme.html index e05804a..14d2b6d 100644 --- a/examples/graph/binpack/readme.html +++ b/examples/graph/binpack/readme.html @@ -406,7 +406,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/binpack/xcode/binpack.xcodeproj/project.pbxproj b/examples/graph/binpack/xcode/binpack.xcodeproj/project.pbxproj index 5d282c4..ad27f72 100644 --- a/examples/graph/binpack/xcode/binpack.xcodeproj/project.pbxproj +++ b/examples/graph/binpack/xcode/binpack.xcodeproj/project.pbxproj @@ -289,7 +289,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "binpack" */ = { isa = XCConfigurationList; @@ -298,7 +298,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/graph/cholesky/Makefile b/examples/graph/cholesky/Makefile index 5f8b60e..cf207a3 100644 --- a/examples/graph/cholesky/Makefile +++ b/examples/graph/cholesky/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/cholesky/Makefile.windows b/examples/graph/cholesky/Makefile.windows index d244a6a..39a8ac8 100644 --- a/examples/graph/cholesky/Makefile.windows +++ b/examples/graph/cholesky/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/cholesky/cholesky.cpp b/examples/graph/cholesky/cholesky.cpp index d11c940..a7dc0b2 100644 --- a/examples/graph/cholesky/cholesky.cpp +++ b/examples/graph/cholesky/cholesky.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/cholesky/init.cpp b/examples/graph/cholesky/init.cpp index 4fd8992..7b0e3cf 100644 --- a/examples/graph/cholesky/init.cpp +++ b/examples/graph/cholesky/init.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/cholesky/readme.html b/examples/graph/cholesky/readme.html index cb82eba..748454d 100644 --- a/examples/graph/cholesky/readme.html +++ b/examples/graph/cholesky/readme.html @@ -406,7 +406,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/cholesky/xcode/cholesky.xcodeproj/project.pbxproj b/examples/graph/cholesky/xcode/cholesky.xcodeproj/project.pbxproj index 6529166..041d3bc 100644 --- a/examples/graph/cholesky/xcode/cholesky.xcodeproj/project.pbxproj +++ b/examples/graph/cholesky/xcode/cholesky.xcodeproj/project.pbxproj @@ -299,7 +299,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "cholesky" */ = { isa = XCConfigurationList; @@ -308,7 +308,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/graph/cholesky/xcode/cholesky.xcodeproj/xcshareddata/xcschemes/Cholesky.xcscheme b/examples/graph/cholesky/xcode/cholesky.xcodeproj/xcshareddata/xcschemes/Cholesky.xcscheme new file mode 100644 index 0000000..a650a0f --- /dev/null +++ b/examples/graph/cholesky/xcode/cholesky.xcodeproj/xcshareddata/xcschemes/Cholesky.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/graph/dining_philosophers/Makefile b/examples/graph/dining_philosophers/Makefile index 63d4273..7d9cf6b 100644 --- a/examples/graph/dining_philosophers/Makefile +++ b/examples/graph/dining_philosophers/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/dining_philosophers/Makefile.windows b/examples/graph/dining_philosophers/Makefile.windows index 6a3267b..1e73129 100644 --- a/examples/graph/dining_philosophers/Makefile.windows +++ b/examples/graph/dining_philosophers/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/dining_philosophers/dining_philosophers.cpp b/examples/graph/dining_philosophers/dining_philosophers.cpp index 66b18b6..453174b 100644 --- a/examples/graph/dining_philosophers/dining_philosophers.cpp +++ b/examples/graph/dining_philosophers/dining_philosophers.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/dining_philosophers/readme.html b/examples/graph/dining_philosophers/readme.html index ada56dd..83454d2 100644 --- a/examples/graph/dining_philosophers/readme.html +++ b/examples/graph/dining_philosophers/readme.html @@ -374,7 +374,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/dining_philosophers/xcode/dining_philosophers.xcodeproj/project.pbxproj b/examples/graph/dining_philosophers/xcode/dining_philosophers.xcodeproj/project.pbxproj index 83e6266..7a3535d 100644 --- a/examples/graph/dining_philosophers/xcode/dining_philosophers.xcodeproj/project.pbxproj +++ b/examples/graph/dining_philosophers/xcode/dining_philosophers.xcodeproj/project.pbxproj @@ -297,7 +297,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "dining_philosophers" */ = { isa = XCConfigurationList; @@ -306,7 +306,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/graph/fgbzip2/Makefile b/examples/graph/fgbzip2/Makefile index 0b01b04..fadc840 100644 --- a/examples/graph/fgbzip2/Makefile +++ b/examples/graph/fgbzip2/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/Makefile.windows b/examples/graph/fgbzip2/Makefile.windows index e3a539d..6ae4a78 100644 --- a/examples/graph/fgbzip2/Makefile.windows +++ b/examples/graph/fgbzip2/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/blocksort.cpp b/examples/graph/fgbzip2/blocksort.cpp index 60dffb4..27c4b55 100644 --- a/examples/graph/fgbzip2/blocksort.cpp +++ b/examples/graph/fgbzip2/blocksort.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/bzlib.cpp b/examples/graph/fgbzip2/bzlib.cpp index 8a41306..56472ea 100644 --- a/examples/graph/fgbzip2/bzlib.cpp +++ b/examples/graph/fgbzip2/bzlib.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/bzlib.h b/examples/graph/fgbzip2/bzlib.h index cfd2221..72da0b5 100644 --- a/examples/graph/fgbzip2/bzlib.h +++ b/examples/graph/fgbzip2/bzlib.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/bzlib_private.h b/examples/graph/fgbzip2/bzlib_private.h index 14f0376..191d8c1 100644 --- a/examples/graph/fgbzip2/bzlib_private.h +++ b/examples/graph/fgbzip2/bzlib_private.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/compress.cpp b/examples/graph/fgbzip2/compress.cpp index 46ab18a..0e3d78f 100644 --- a/examples/graph/fgbzip2/compress.cpp +++ b/examples/graph/fgbzip2/compress.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/crctable.cpp b/examples/graph/fgbzip2/crctable.cpp index a64504f..dc14cfa 100644 --- a/examples/graph/fgbzip2/crctable.cpp +++ b/examples/graph/fgbzip2/crctable.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/decompress.cpp b/examples/graph/fgbzip2/decompress.cpp index 85b0a14..3cf1c38 100644 --- a/examples/graph/fgbzip2/decompress.cpp +++ b/examples/graph/fgbzip2/decompress.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/fgbzip2.cpp b/examples/graph/fgbzip2/fgbzip2.cpp index 8ab1da2..c9b7910 100644 --- a/examples/graph/fgbzip2/fgbzip2.cpp +++ b/examples/graph/fgbzip2/fgbzip2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/huffman.cpp b/examples/graph/fgbzip2/huffman.cpp index 717e053..ebb4fe9 100644 --- a/examples/graph/fgbzip2/huffman.cpp +++ b/examples/graph/fgbzip2/huffman.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/randtable.cpp b/examples/graph/fgbzip2/randtable.cpp index 67f9a37..09364f8 100644 --- a/examples/graph/fgbzip2/randtable.cpp +++ b/examples/graph/fgbzip2/randtable.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/fgbzip2/readme.html b/examples/graph/fgbzip2/readme.html index 0f3e9af..14f5b15 100644 --- a/examples/graph/fgbzip2/readme.html +++ b/examples/graph/fgbzip2/readme.html @@ -420,7 +420,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/fgbzip2/xcode/fgbzip2.xcodeproj/project.pbxproj b/examples/graph/fgbzip2/xcode/fgbzip2.xcodeproj/project.pbxproj index dceabcc..69f17bd 100644 --- a/examples/graph/fgbzip2/xcode/fgbzip2.xcodeproj/project.pbxproj +++ b/examples/graph/fgbzip2/xcode/fgbzip2.xcodeproj/project.pbxproj @@ -320,7 +320,7 @@ 1DEB923308733DC60010E9CD /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "fgbzip2" */ = { isa = XCConfigurationList; @@ -329,7 +329,7 @@ 1DEB923708733DC60010E9CD /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/graph/index.html b/examples/graph/index.html index 095b92b..1e0d5bb 100644 --- a/examples/graph/index.html +++ b/examples/graph/index.html @@ -349,7 +349,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/logic_sim/D_latch.h b/examples/graph/logic_sim/D_latch.h index de14d9c..23abad3 100644 --- a/examples/graph/logic_sim/D_latch.h +++ b/examples/graph/logic_sim/D_latch.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/Makefile b/examples/graph/logic_sim/Makefile index 0a7d6f6..c5814b6 100644 --- a/examples/graph/logic_sim/Makefile +++ b/examples/graph/logic_sim/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/Makefile.windows b/examples/graph/logic_sim/Makefile.windows index b7d25e1..7f752b8 100644 --- a/examples/graph/logic_sim/Makefile.windows +++ b/examples/graph/logic_sim/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/basics.h b/examples/graph/logic_sim/basics.h index 527ca92..de349f8 100644 --- a/examples/graph/logic_sim/basics.h +++ b/examples/graph/logic_sim/basics.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/four_bit_adder.h b/examples/graph/logic_sim/four_bit_adder.h index 0818eb4..f74fd86 100644 --- a/examples/graph/logic_sim/four_bit_adder.h +++ b/examples/graph/logic_sim/four_bit_adder.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/one_bit_adder.h b/examples/graph/logic_sim/one_bit_adder.h index 4ba65a0..b0ed98f 100644 --- a/examples/graph/logic_sim/one_bit_adder.h +++ b/examples/graph/logic_sim/one_bit_adder.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/readme.html b/examples/graph/logic_sim/readme.html index 23947d7..ed287f3 100644 --- a/examples/graph/logic_sim/readme.html +++ b/examples/graph/logic_sim/readme.html @@ -397,7 +397,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/logic_sim/test_all.cpp b/examples/graph/logic_sim/test_all.cpp index 0e8574d..884c310 100644 --- a/examples/graph/logic_sim/test_all.cpp +++ b/examples/graph/logic_sim/test_all.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/logic_sim/two_bit_adder.h b/examples/graph/logic_sim/two_bit_adder.h index 3e9b9f5..d54f906 100644 --- a/examples/graph/logic_sim/two_bit_adder.h +++ b/examples/graph/logic_sim/two_bit_adder.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/matmult/Makefile b/examples/graph/matmult/Makefile index 413bab9..e5176c9 100644 --- a/examples/graph/matmult/Makefile +++ b/examples/graph/matmult/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/matmult/Makefile.windows b/examples/graph/matmult/Makefile.windows index e861145..4d88b22 100644 --- a/examples/graph/matmult/Makefile.windows +++ b/examples/graph/matmult/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/matmult/matmult.cpp b/examples/graph/matmult/matmult.cpp index 4287922..6218078 100644 --- a/examples/graph/matmult/matmult.cpp +++ b/examples/graph/matmult/matmult.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2016-2018 Intel Corporation + Copyright (c) 2016-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/matmult/readme.html b/examples/graph/matmult/readme.html index ffc2e7e..01cac33 100644 --- a/examples/graph/matmult/readme.html +++ b/examples/graph/matmult/readme.html @@ -391,7 +391,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/som/Makefile b/examples/graph/som/Makefile index 7312e07..1fd5919 100644 --- a/examples/graph/som/Makefile +++ b/examples/graph/som/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/som/Makefile.windows b/examples/graph/som/Makefile.windows index d0bfdc1..97a228b 100644 --- a/examples/graph/som/Makefile.windows +++ b/examples/graph/som/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/som/readme.html b/examples/graph/som/readme.html index 18e34d5..82696a2 100644 --- a/examples/graph/som/readme.html +++ b/examples/graph/som/readme.html @@ -382,7 +382,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/som/som.cpp b/examples/graph/som/som.cpp index 89b58da..a0b4cfd 100644 --- a/examples/graph/som/som.cpp +++ b/examples/graph/som/som.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/som/som.h b/examples/graph/som/som.h index 9d46e7f..f14b651 100644 --- a/examples/graph/som/som.h +++ b/examples/graph/som/som.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/som/som_graph.cpp b/examples/graph/som/som_graph.cpp index 1875904..771ef86 100644 --- a/examples/graph/som/som_graph.cpp +++ b/examples/graph/som/som_graph.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/som/xcode/som.xcodeproj/project.pbxproj b/examples/graph/som/xcode/som.xcodeproj/project.pbxproj index 41fd598..96c8393 100644 --- a/examples/graph/som/xcode/som.xcodeproj/project.pbxproj +++ b/examples/graph/som/xcode/som.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "som" */ = { isa = XCConfigurationList; @@ -304,7 +304,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/graph/stereo/Makefile b/examples/graph/stereo/Makefile index 404dafa..8d60c06 100644 --- a/examples/graph/stereo/Makefile +++ b/examples/graph/stereo/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/Makefile.windows b/examples/graph/stereo/Makefile.windows index 032fa95..d8243bc 100644 --- a/examples/graph/stereo/Makefile.windows +++ b/examples/graph/stereo/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/imageEffects.cl b/examples/graph/stereo/imageEffects.cl index 7c77955..63cc154 100644 --- a/examples/graph/stereo/imageEffects.cl +++ b/examples/graph/stereo/imageEffects.cl @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/lodepng.cpp b/examples/graph/stereo/lodepng.cpp index 5080f5a..af9c3f5 100644 --- a/examples/graph/stereo/lodepng.cpp +++ b/examples/graph/stereo/lodepng.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/lodepng.h b/examples/graph/stereo/lodepng.h index 91f769b..be8d06a 100644 --- a/examples/graph/stereo/lodepng.h +++ b/examples/graph/stereo/lodepng.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/readme.html b/examples/graph/stereo/readme.html index d7d787d..e64d58f 100644 --- a/examples/graph/stereo/readme.html +++ b/examples/graph/stereo/readme.html @@ -412,7 +412,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/graph/stereo/stereo.cpp b/examples/graph/stereo/stereo.cpp index 44dfd53..da33477 100644 --- a/examples/graph/stereo/stereo.cpp +++ b/examples/graph/stereo/stereo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/utils.h b/examples/graph/stereo/utils.h index c99399f..14bcd21 100644 --- a/examples/graph/stereo/utils.h +++ b/examples/graph/stereo/utils.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/graph/stereo/xcode/stereo.xcodeproj/project.pbxproj b/examples/graph/stereo/xcode/stereo.xcodeproj/project.pbxproj index 820122d..c1a1c03 100644 --- a/examples/graph/stereo/xcode/stereo.xcodeproj/project.pbxproj +++ b/examples/graph/stereo/xcode/stereo.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "stereo" */ = { isa = XCConfigurationList; @@ -316,7 +316,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/index.html b/examples/index.html index e9065fe..e905bb0 100644 --- a/examples/index.html +++ b/examples/index.html @@ -572,7 +572,7 @@ source <installdir>/bin/tbbvars.csh (arch) [platform [TBBROOT_detec

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_do/index.html b/examples/parallel_do/index.html index f211569..cae0405 100644 --- a/examples/parallel_do/index.html +++ b/examples/parallel_do/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_do/parallel_preorder/Graph.cpp b/examples/parallel_do/parallel_preorder/Graph.cpp index c8429db..fd9c133 100644 --- a/examples/parallel_do/parallel_preorder/Graph.cpp +++ b/examples/parallel_do/parallel_preorder/Graph.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/Graph.h b/examples/parallel_do/parallel_preorder/Graph.h index 1f4ed12..0eb63c0 100644 --- a/examples/parallel_do/parallel_preorder/Graph.h +++ b/examples/parallel_do/parallel_preorder/Graph.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/Makefile b/examples/parallel_do/parallel_preorder/Makefile index 3516207..0e84694 100644 --- a/examples/parallel_do/parallel_preorder/Makefile +++ b/examples/parallel_do/parallel_preorder/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/Makefile.windows b/examples/parallel_do/parallel_preorder/Makefile.windows index d419012..8c056d8 100644 --- a/examples/parallel_do/parallel_preorder/Makefile.windows +++ b/examples/parallel_do/parallel_preorder/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/Matrix.h b/examples/parallel_do/parallel_preorder/Matrix.h index aacc41d..4ca1180 100644 --- a/examples/parallel_do/parallel_preorder/Matrix.h +++ b/examples/parallel_do/parallel_preorder/Matrix.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/main.cpp b/examples/parallel_do/parallel_preorder/main.cpp index 6b1a19c..4b35821 100644 --- a/examples/parallel_do/parallel_preorder/main.cpp +++ b/examples/parallel_do/parallel_preorder/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/parallel_preorder.cpp b/examples/parallel_do/parallel_preorder/parallel_preorder.cpp index 0839da9..afe1047 100644 --- a/examples/parallel_do/parallel_preorder/parallel_preorder.cpp +++ b/examples/parallel_do/parallel_preorder/parallel_preorder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_do/parallel_preorder/readme.html b/examples/parallel_do/parallel_preorder/readme.html index 43b1768..88739ee 100644 --- a/examples/parallel_do/parallel_preorder/readme.html +++ b/examples/parallel_do/parallel_preorder/readme.html @@ -435,7 +435,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_do/parallel_preorder/xcode/parallel_preorder.xcodeproj/project.pbxproj b/examples/parallel_do/parallel_preorder/xcode/parallel_preorder.xcodeproj/project.pbxproj index d3c8cb6..10431bb 100644 --- a/examples/parallel_do/parallel_preorder/xcode/parallel_preorder.xcodeproj/project.pbxproj +++ b/examples/parallel_do/parallel_preorder/xcode/parallel_preorder.xcodeproj/project.pbxproj @@ -255,7 +255,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "parallel_preorder" */ = { isa = XCConfigurationList; @@ -264,7 +264,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/parallel_for/game_of_life/Makefile b/examples/parallel_for/game_of_life/Makefile index 3ca0696..630d65c 100644 --- a/examples/parallel_for/game_of_life/Makefile +++ b/examples/parallel_for/game_of_life/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/Makefile.windows b/examples/parallel_for/game_of_life/Makefile.windows index 15c9343..5101cde 100644 --- a/examples/parallel_for/game_of_life/Makefile.windows +++ b/examples/parallel_for/game_of_life/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/msvs/resource.h b/examples/parallel_for/game_of_life/msvs/resource.h index 4176a01..2aecf29 100644 --- a/examples/parallel_for/game_of_life/msvs/resource.h +++ b/examples/parallel_for/game_of_life/msvs/resource.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/readme.html b/examples/parallel_for/game_of_life/readme.html index a690a81..09fbd7b 100644 --- a/examples/parallel_for/game_of_life/readme.html +++ b/examples/parallel_for/game_of_life/readme.html @@ -383,7 +383,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_for/game_of_life/src/AssemblyInfo.cpp b/examples/parallel_for/game_of_life/src/AssemblyInfo.cpp index 44eb0d8..af07dcd 100644 --- a/examples/parallel_for/game_of_life/src/AssemblyInfo.cpp +++ b/examples/parallel_for/game_of_life/src/AssemblyInfo.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/src/Board.h b/examples/parallel_for/game_of_life/src/Board.h index a0e0ad7..7d4ace7 100644 --- a/examples/parallel_for/game_of_life/src/Board.h +++ b/examples/parallel_for/game_of_life/src/Board.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/src/Evolution.cpp b/examples/parallel_for/game_of_life/src/Evolution.cpp index 357cc70..94290a4 100644 --- a/examples/parallel_for/game_of_life/src/Evolution.cpp +++ b/examples/parallel_for/game_of_life/src/Evolution.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/src/Evolution.h b/examples/parallel_for/game_of_life/src/Evolution.h index d485396..a7580d0 100644 --- a/examples/parallel_for/game_of_life/src/Evolution.h +++ b/examples/parallel_for/game_of_life/src/Evolution.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/src/Form1.h b/examples/parallel_for/game_of_life/src/Form1.h index 59d3600..0fa729b 100644 --- a/examples/parallel_for/game_of_life/src/Form1.h +++ b/examples/parallel_for/game_of_life/src/Form1.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/src/Game_of_life.cpp b/examples/parallel_for/game_of_life/src/Game_of_life.cpp index f13cbe9..dcf3238 100644 --- a/examples/parallel_for/game_of_life/src/Game_of_life.cpp +++ b/examples/parallel_for/game_of_life/src/Game_of_life.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/src/Update_state.cpp b/examples/parallel_for/game_of_life/src/Update_state.cpp index a7e58b0..32c2ec5 100644 --- a/examples/parallel_for/game_of_life/src/Update_state.cpp +++ b/examples/parallel_for/game_of_life/src/Update_state.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/game_of_life/xcode/game_of_life.xcodeproj/project.pbxproj b/examples/parallel_for/game_of_life/xcode/game_of_life.xcodeproj/project.pbxproj index cd8a515..d12eafb 100644 --- a/examples/parallel_for/game_of_life/xcode/game_of_life.xcodeproj/project.pbxproj +++ b/examples/parallel_for/game_of_life/xcode/game_of_life.xcodeproj/project.pbxproj @@ -253,7 +253,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "game_of_life" */ = { isa = XCConfigurationList; @@ -262,7 +262,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/parallel_for/index.html b/examples/parallel_for/index.html index 2b8a77d..46b53c3 100644 --- a/examples/parallel_for/index.html +++ b/examples/parallel_for/index.html @@ -341,7 +341,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_for/polygon_overlay/Makefile b/examples/parallel_for/polygon_overlay/Makefile index d1c9459..829b91a 100644 --- a/examples/parallel_for/polygon_overlay/Makefile +++ b/examples/parallel_for/polygon_overlay/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/Makefile.windows b/examples/parallel_for/polygon_overlay/Makefile.windows index 6449071..d47d97f 100644 --- a/examples/parallel_for/polygon_overlay/Makefile.windows +++ b/examples/parallel_for/polygon_overlay/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/msvs/resource.h b/examples/parallel_for/polygon_overlay/msvs/resource.h index 5a43816..4efef27 100644 --- a/examples/parallel_for/polygon_overlay/msvs/resource.h +++ b/examples/parallel_for/polygon_overlay/msvs/resource.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/polymain.cpp b/examples/parallel_for/polygon_overlay/polymain.cpp index ec3ecd9..4157c5d 100644 --- a/examples/parallel_for/polygon_overlay/polymain.cpp +++ b/examples/parallel_for/polygon_overlay/polymain.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/polymain.h b/examples/parallel_for/polygon_overlay/polymain.h index 56695d6..8681e18 100644 --- a/examples/parallel_for/polygon_overlay/polymain.h +++ b/examples/parallel_for/polygon_overlay/polymain.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/polyover.cpp b/examples/parallel_for/polygon_overlay/polyover.cpp index f155f62..25491f5 100644 --- a/examples/parallel_for/polygon_overlay/polyover.cpp +++ b/examples/parallel_for/polygon_overlay/polyover.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/polyover.h b/examples/parallel_for/polygon_overlay/polyover.h index 440f2e8..b30231f 100644 --- a/examples/parallel_for/polygon_overlay/polyover.h +++ b/examples/parallel_for/polygon_overlay/polyover.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/pover_global.h b/examples/parallel_for/polygon_overlay/pover_global.h index 570fc6a..322e08b 100644 --- a/examples/parallel_for/polygon_overlay/pover_global.h +++ b/examples/parallel_for/polygon_overlay/pover_global.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/pover_video.cpp b/examples/parallel_for/polygon_overlay/pover_video.cpp index 0b2cf7b..3b9fa7f 100644 --- a/examples/parallel_for/polygon_overlay/pover_video.cpp +++ b/examples/parallel_for/polygon_overlay/pover_video.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/pover_video.h b/examples/parallel_for/polygon_overlay/pover_video.h index 385716d..e9487af 100644 --- a/examples/parallel_for/polygon_overlay/pover_video.h +++ b/examples/parallel_for/polygon_overlay/pover_video.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/polygon_overlay/readme.html b/examples/parallel_for/polygon_overlay/readme.html index 1008b52..b3e71d6 100644 --- a/examples/parallel_for/polygon_overlay/readme.html +++ b/examples/parallel_for/polygon_overlay/readme.html @@ -467,7 +467,7 @@

Intel, Intel Core and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_for/polygon_overlay/rpolygon.h b/examples/parallel_for/polygon_overlay/rpolygon.h index 9cc8f74..cdac720 100644 --- a/examples/parallel_for/polygon_overlay/rpolygon.h +++ b/examples/parallel_for/polygon_overlay/rpolygon.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/Makefile b/examples/parallel_for/seismic/Makefile index 9c839df..bc5e0c3 100644 --- a/examples/parallel_for/seismic/Makefile +++ b/examples/parallel_for/seismic/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/Makefile.windows b/examples/parallel_for/seismic/Makefile.windows index 5ebaac4..cac85fa 100644 --- a/examples/parallel_for/seismic/Makefile.windows +++ b/examples/parallel_for/seismic/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/main.cpp b/examples/parallel_for/seismic/main.cpp index 3905c27..89ddd29 100644 --- a/examples/parallel_for/seismic/main.cpp +++ b/examples/parallel_for/seismic/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/msvs/resource.h b/examples/parallel_for/seismic/msvs/resource.h index c984e28..977bb99 100644 --- a/examples/parallel_for/seismic/msvs/resource.h +++ b/examples/parallel_for/seismic/msvs/resource.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/readme.html b/examples/parallel_for/seismic/readme.html index b7a660f..3222d32 100644 --- a/examples/parallel_for/seismic/readme.html +++ b/examples/parallel_for/seismic/readme.html @@ -462,7 +462,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_for/seismic/seismic_video.cpp b/examples/parallel_for/seismic/seismic_video.cpp index 3c3abb0..9f624ac 100644 --- a/examples/parallel_for/seismic/seismic_video.cpp +++ b/examples/parallel_for/seismic/seismic_video.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/seismic_video.h b/examples/parallel_for/seismic/seismic_video.h index d9acaa8..8d3932a 100644 --- a/examples/parallel_for/seismic/seismic_video.h +++ b/examples/parallel_for/seismic/seismic_video.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/universe.cpp b/examples/parallel_for/seismic/universe.cpp index eb9e682..a84bb53 100644 --- a/examples/parallel_for/seismic/universe.cpp +++ b/examples/parallel_for/seismic/universe.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/universe.h b/examples/parallel_for/seismic/universe.h index 5ba6df0..e62f2a7 100644 --- a/examples/parallel_for/seismic/universe.h +++ b/examples/parallel_for/seismic/universe.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/seismic/xcode/seismic.xcodeproj/project.pbxproj b/examples/parallel_for/seismic/xcode/seismic.xcodeproj/project.pbxproj index da6ed45..e7b91fd 100644 --- a/examples/parallel_for/seismic/xcode/seismic.xcodeproj/project.pbxproj +++ b/examples/parallel_for/seismic/xcode/seismic.xcodeproj/project.pbxproj @@ -560,7 +560,7 @@ 84D01771152743200008A4E0 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 84D01772152743200008A4E0 /* Build configuration list for PBXNativeTarget "tbbExample" */ = { isa = XCConfigurationList; @@ -569,7 +569,7 @@ 84D01774152743200008A4E0 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; D3BD96841C0DD00500163D8B /* Build configuration list for PBXNativeTarget "tbbExample_ios" */ = { isa = XCConfigurationList; @@ -578,7 +578,7 @@ D3BD96861C0DD00500163D8B /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/parallel_for/tachyon/Makefile b/examples/parallel_for/tachyon/Makefile index 4e9d3a5..5ad8c2d 100644 --- a/examples/parallel_for/tachyon/Makefile +++ b/examples/parallel_for/tachyon/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/Makefile.windows b/examples/parallel_for/tachyon/Makefile.windows index d9ce96d..776bedf 100644 --- a/examples/parallel_for/tachyon/Makefile.windows +++ b/examples/parallel_for/tachyon/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/resource.h b/examples/parallel_for/tachyon/msvs/resource.h index 4c49a39..ee6e50e 100644 --- a/examples/parallel_for/tachyon/msvs/resource.h +++ b/examples/parallel_for/tachyon/msvs/resource.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.cpp b/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.cpp index ff15380..aa0f1a8 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.cpp +++ b/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.h b/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.h index 1074048..66f8ef8 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.h +++ b/examples/parallel_for/tachyon/msvs/win8ui/App.xaml.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.cpp b/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.cpp index 721d1c9..bf5b6b6 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.cpp +++ b/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.h b/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.h index 9964fb0..b46a567 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.h +++ b/examples/parallel_for/tachyon/msvs/win8ui/DirectXBase.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.cpp b/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.cpp index 4a46c09..93784af 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.cpp +++ b/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.h b/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.h index 274aa28..0c2a9ba 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.h +++ b/examples/parallel_for/tachyon/msvs/win8ui/DirectXPage.xaml.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/copy_libraries_and_assets.bat b/examples/parallel_for/tachyon/msvs/win8ui/copy_libraries_and_assets.bat index 7dae5be..a47d63b 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/copy_libraries_and_assets.bat +++ b/examples/parallel_for/tachyon/msvs/win8ui/copy_libraries_and_assets.bat @@ -1,6 +1,6 @@ @echo on REM -REM Copyright (c) 2005-2018 Intel Corporation +REM Copyright (c) 2005-2019 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. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/pch.h b/examples/parallel_for/tachyon/msvs/win8ui/pch.h index afcd2e9..1a5d046 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/pch.h +++ b/examples/parallel_for/tachyon/msvs/win8ui/pch.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.cpp b/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.cpp index 3ebb1f6..9ac4206 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.cpp +++ b/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.h b/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.h index dda3e02..17d7736 100644 --- a/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.h +++ b/examples/parallel_for/tachyon/msvs/win8ui/tbbTachyonRenderer.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/readme.html b/examples/parallel_for/tachyon/readme.html index bec0b48..088f450 100644 --- a/examples/parallel_for/tachyon/readme.html +++ b/examples/parallel_for/tachyon/readme.html @@ -528,7 +528,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_for/tachyon/src/api.cpp b/examples/parallel_for/tachyon/src/api.cpp index eec81e7..d6bd6c0 100644 --- a/examples/parallel_for/tachyon/src/api.cpp +++ b/examples/parallel_for/tachyon/src/api.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/api.h b/examples/parallel_for/tachyon/src/api.h index dcfa43c..e581a0f 100644 --- a/examples/parallel_for/tachyon/src/api.h +++ b/examples/parallel_for/tachyon/src/api.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/apigeom.cpp b/examples/parallel_for/tachyon/src/apigeom.cpp index e8b6119..2dc0f6e 100644 --- a/examples/parallel_for/tachyon/src/apigeom.cpp +++ b/examples/parallel_for/tachyon/src/apigeom.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/apitrigeom.cpp b/examples/parallel_for/tachyon/src/apitrigeom.cpp index 7be974d..87304f8 100644 --- a/examples/parallel_for/tachyon/src/apitrigeom.cpp +++ b/examples/parallel_for/tachyon/src/apitrigeom.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/apitrigeom.h b/examples/parallel_for/tachyon/src/apitrigeom.h index 9a04136..65acf1f 100644 --- a/examples/parallel_for/tachyon/src/apitrigeom.h +++ b/examples/parallel_for/tachyon/src/apitrigeom.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/bndbox.cpp b/examples/parallel_for/tachyon/src/bndbox.cpp index 1d19283..635426b 100644 --- a/examples/parallel_for/tachyon/src/bndbox.cpp +++ b/examples/parallel_for/tachyon/src/bndbox.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/bndbox.h b/examples/parallel_for/tachyon/src/bndbox.h index 968a4ab..1046db0 100644 --- a/examples/parallel_for/tachyon/src/bndbox.h +++ b/examples/parallel_for/tachyon/src/bndbox.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/box.cpp b/examples/parallel_for/tachyon/src/box.cpp index 57445a6..4ddf356 100644 --- a/examples/parallel_for/tachyon/src/box.cpp +++ b/examples/parallel_for/tachyon/src/box.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/box.h b/examples/parallel_for/tachyon/src/box.h index eaf63a7..002ff3b 100644 --- a/examples/parallel_for/tachyon/src/box.h +++ b/examples/parallel_for/tachyon/src/box.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/camera.cpp b/examples/parallel_for/tachyon/src/camera.cpp index d53c0fe..d49c542 100644 --- a/examples/parallel_for/tachyon/src/camera.cpp +++ b/examples/parallel_for/tachyon/src/camera.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/camera.h b/examples/parallel_for/tachyon/src/camera.h index 726bd38..c74058f 100644 --- a/examples/parallel_for/tachyon/src/camera.h +++ b/examples/parallel_for/tachyon/src/camera.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/coordsys.cpp b/examples/parallel_for/tachyon/src/coordsys.cpp index 7576f92..8c3e76a 100644 --- a/examples/parallel_for/tachyon/src/coordsys.cpp +++ b/examples/parallel_for/tachyon/src/coordsys.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/coordsys.h b/examples/parallel_for/tachyon/src/coordsys.h index 0529188..d4c5913 100644 --- a/examples/parallel_for/tachyon/src/coordsys.h +++ b/examples/parallel_for/tachyon/src/coordsys.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/cylinder.cpp b/examples/parallel_for/tachyon/src/cylinder.cpp index 52baa43..4d56ece 100644 --- a/examples/parallel_for/tachyon/src/cylinder.cpp +++ b/examples/parallel_for/tachyon/src/cylinder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/cylinder.h b/examples/parallel_for/tachyon/src/cylinder.h index e766454..7147f9a 100644 --- a/examples/parallel_for/tachyon/src/cylinder.h +++ b/examples/parallel_for/tachyon/src/cylinder.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/extvol.cpp b/examples/parallel_for/tachyon/src/extvol.cpp index 6dadb24..c52d344 100644 --- a/examples/parallel_for/tachyon/src/extvol.cpp +++ b/examples/parallel_for/tachyon/src/extvol.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/extvol.h b/examples/parallel_for/tachyon/src/extvol.h index 4f298fc..1e5b17c 100644 --- a/examples/parallel_for/tachyon/src/extvol.h +++ b/examples/parallel_for/tachyon/src/extvol.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/global.cpp b/examples/parallel_for/tachyon/src/global.cpp index f0e8b00..1c9c2c6 100644 --- a/examples/parallel_for/tachyon/src/global.cpp +++ b/examples/parallel_for/tachyon/src/global.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/global.h b/examples/parallel_for/tachyon/src/global.h index 2bf51bd..a306576 100644 --- a/examples/parallel_for/tachyon/src/global.h +++ b/examples/parallel_for/tachyon/src/global.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/grid.cpp b/examples/parallel_for/tachyon/src/grid.cpp index 691592b..e9580e5 100644 --- a/examples/parallel_for/tachyon/src/grid.cpp +++ b/examples/parallel_for/tachyon/src/grid.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/grid.h b/examples/parallel_for/tachyon/src/grid.h index 2cd4c2a..84ea063 100644 --- a/examples/parallel_for/tachyon/src/grid.h +++ b/examples/parallel_for/tachyon/src/grid.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/imageio.cpp b/examples/parallel_for/tachyon/src/imageio.cpp index 97af731..bbfde63 100644 --- a/examples/parallel_for/tachyon/src/imageio.cpp +++ b/examples/parallel_for/tachyon/src/imageio.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/imageio.h b/examples/parallel_for/tachyon/src/imageio.h index f1dc972..e8e2bc2 100644 --- a/examples/parallel_for/tachyon/src/imageio.h +++ b/examples/parallel_for/tachyon/src/imageio.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/imap.cpp b/examples/parallel_for/tachyon/src/imap.cpp index c2eaa0c..ce2d9c3 100644 --- a/examples/parallel_for/tachyon/src/imap.cpp +++ b/examples/parallel_for/tachyon/src/imap.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/imap.h b/examples/parallel_for/tachyon/src/imap.h index db65f7a..db6ea81 100644 --- a/examples/parallel_for/tachyon/src/imap.h +++ b/examples/parallel_for/tachyon/src/imap.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/intersect.cpp b/examples/parallel_for/tachyon/src/intersect.cpp index 40f4710..04de46c 100644 --- a/examples/parallel_for/tachyon/src/intersect.cpp +++ b/examples/parallel_for/tachyon/src/intersect.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/intersect.h b/examples/parallel_for/tachyon/src/intersect.h index f58193f..db47db9 100644 --- a/examples/parallel_for/tachyon/src/intersect.h +++ b/examples/parallel_for/tachyon/src/intersect.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/jpeg.cpp b/examples/parallel_for/tachyon/src/jpeg.cpp index c08af7b..3772645 100644 --- a/examples/parallel_for/tachyon/src/jpeg.cpp +++ b/examples/parallel_for/tachyon/src/jpeg.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/jpeg.h b/examples/parallel_for/tachyon/src/jpeg.h index ab66353..60f4b70 100644 --- a/examples/parallel_for/tachyon/src/jpeg.h +++ b/examples/parallel_for/tachyon/src/jpeg.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/light.cpp b/examples/parallel_for/tachyon/src/light.cpp index dc1e38a..fef05f3 100644 --- a/examples/parallel_for/tachyon/src/light.cpp +++ b/examples/parallel_for/tachyon/src/light.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/light.h b/examples/parallel_for/tachyon/src/light.h index 0625ba7..3429a26 100644 --- a/examples/parallel_for/tachyon/src/light.h +++ b/examples/parallel_for/tachyon/src/light.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/machine.h b/examples/parallel_for/tachyon/src/machine.h index a73ad10..b688f63 100644 --- a/examples/parallel_for/tachyon/src/machine.h +++ b/examples/parallel_for/tachyon/src/machine.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/macros.h b/examples/parallel_for/tachyon/src/macros.h index c3a1fab..0f00624 100644 --- a/examples/parallel_for/tachyon/src/macros.h +++ b/examples/parallel_for/tachyon/src/macros.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/main.cpp b/examples/parallel_for/tachyon/src/main.cpp index a724df8..9a596ac 100644 --- a/examples/parallel_for/tachyon/src/main.cpp +++ b/examples/parallel_for/tachyon/src/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/objbound.cpp b/examples/parallel_for/tachyon/src/objbound.cpp index 704f404..c9fe7c4 100644 --- a/examples/parallel_for/tachyon/src/objbound.cpp +++ b/examples/parallel_for/tachyon/src/objbound.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/objbound.h b/examples/parallel_for/tachyon/src/objbound.h index f40575f..a486288 100644 --- a/examples/parallel_for/tachyon/src/objbound.h +++ b/examples/parallel_for/tachyon/src/objbound.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/parse.cpp b/examples/parallel_for/tachyon/src/parse.cpp index ce3ebc5..8b59c85 100644 --- a/examples/parallel_for/tachyon/src/parse.cpp +++ b/examples/parallel_for/tachyon/src/parse.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/parse.h b/examples/parallel_for/tachyon/src/parse.h index b16bd1e..3e488b4 100644 --- a/examples/parallel_for/tachyon/src/parse.h +++ b/examples/parallel_for/tachyon/src/parse.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/plane.cpp b/examples/parallel_for/tachyon/src/plane.cpp index 5c34a26..0032380 100644 --- a/examples/parallel_for/tachyon/src/plane.cpp +++ b/examples/parallel_for/tachyon/src/plane.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/plane.h b/examples/parallel_for/tachyon/src/plane.h index 474ca30..280dc7b 100644 --- a/examples/parallel_for/tachyon/src/plane.h +++ b/examples/parallel_for/tachyon/src/plane.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/ppm.cpp b/examples/parallel_for/tachyon/src/ppm.cpp index d63c179..72c74f9 100644 --- a/examples/parallel_for/tachyon/src/ppm.cpp +++ b/examples/parallel_for/tachyon/src/ppm.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/ppm.h b/examples/parallel_for/tachyon/src/ppm.h index bcb3d17..b28475f 100644 --- a/examples/parallel_for/tachyon/src/ppm.h +++ b/examples/parallel_for/tachyon/src/ppm.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/pthread.cpp b/examples/parallel_for/tachyon/src/pthread.cpp index 609ad97..c609e51 100644 --- a/examples/parallel_for/tachyon/src/pthread.cpp +++ b/examples/parallel_for/tachyon/src/pthread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/pthread_w.h b/examples/parallel_for/tachyon/src/pthread_w.h index 8837d70..e08835a 100644 --- a/examples/parallel_for/tachyon/src/pthread_w.h +++ b/examples/parallel_for/tachyon/src/pthread_w.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/quadric.cpp b/examples/parallel_for/tachyon/src/quadric.cpp index 93e0ef8..6337a9b 100644 --- a/examples/parallel_for/tachyon/src/quadric.cpp +++ b/examples/parallel_for/tachyon/src/quadric.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/quadric.h b/examples/parallel_for/tachyon/src/quadric.h index 8b58303..9d4bcab 100644 --- a/examples/parallel_for/tachyon/src/quadric.h +++ b/examples/parallel_for/tachyon/src/quadric.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/render.cpp b/examples/parallel_for/tachyon/src/render.cpp index 76c2e28..e0d6eef 100644 --- a/examples/parallel_for/tachyon/src/render.cpp +++ b/examples/parallel_for/tachyon/src/render.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/render.h b/examples/parallel_for/tachyon/src/render.h index 29d68bb..ad7f733 100644 --- a/examples/parallel_for/tachyon/src/render.h +++ b/examples/parallel_for/tachyon/src/render.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/ring.cpp b/examples/parallel_for/tachyon/src/ring.cpp index fe9e55d..a7b5c4f 100644 --- a/examples/parallel_for/tachyon/src/ring.cpp +++ b/examples/parallel_for/tachyon/src/ring.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/ring.h b/examples/parallel_for/tachyon/src/ring.h index 9c7ebde..b52c3e0 100644 --- a/examples/parallel_for/tachyon/src/ring.h +++ b/examples/parallel_for/tachyon/src/ring.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/shade.cpp b/examples/parallel_for/tachyon/src/shade.cpp index 1317563..8eff1a8 100644 --- a/examples/parallel_for/tachyon/src/shade.cpp +++ b/examples/parallel_for/tachyon/src/shade.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/shade.h b/examples/parallel_for/tachyon/src/shade.h index 10959bc..2bf5944 100644 --- a/examples/parallel_for/tachyon/src/shade.h +++ b/examples/parallel_for/tachyon/src/shade.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/sphere.cpp b/examples/parallel_for/tachyon/src/sphere.cpp index 2bf2502..24a1c21 100644 --- a/examples/parallel_for/tachyon/src/sphere.cpp +++ b/examples/parallel_for/tachyon/src/sphere.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/sphere.h b/examples/parallel_for/tachyon/src/sphere.h index 6a1ef54..8d43c2c 100644 --- a/examples/parallel_for/tachyon/src/sphere.h +++ b/examples/parallel_for/tachyon/src/sphere.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/tachyon_video.cpp b/examples/parallel_for/tachyon/src/tachyon_video.cpp index 44bd9d6..0f2d606 100644 --- a/examples/parallel_for/tachyon/src/tachyon_video.cpp +++ b/examples/parallel_for/tachyon/src/tachyon_video.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/tachyon_video.h b/examples/parallel_for/tachyon/src/tachyon_video.h index 5b4b9db..0649b65 100644 --- a/examples/parallel_for/tachyon/src/tachyon_video.h +++ b/examples/parallel_for/tachyon/src/tachyon_video.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/texture.cpp b/examples/parallel_for/tachyon/src/texture.cpp index 11134b9..6879eb8 100644 --- a/examples/parallel_for/tachyon/src/texture.cpp +++ b/examples/parallel_for/tachyon/src/texture.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/texture.h b/examples/parallel_for/tachyon/src/texture.h index be0b2a4..1a221fd 100644 --- a/examples/parallel_for/tachyon/src/texture.h +++ b/examples/parallel_for/tachyon/src/texture.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/tgafile.cpp b/examples/parallel_for/tachyon/src/tgafile.cpp index 2be6db5..bf55b29 100644 --- a/examples/parallel_for/tachyon/src/tgafile.cpp +++ b/examples/parallel_for/tachyon/src/tgafile.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/tgafile.h b/examples/parallel_for/tachyon/src/tgafile.h index ddb54d1..0b68802 100644 --- a/examples/parallel_for/tachyon/src/tgafile.h +++ b/examples/parallel_for/tachyon/src/tgafile.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/trace.h b/examples/parallel_for/tachyon/src/trace.h index 24ee59c..2657186 100644 --- a/examples/parallel_for/tachyon/src/trace.h +++ b/examples/parallel_for/tachyon/src/trace.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/trace.serial.cpp b/examples/parallel_for/tachyon/src/trace.serial.cpp index c83a997..9e6412a 100644 --- a/examples/parallel_for/tachyon/src/trace.serial.cpp +++ b/examples/parallel_for/tachyon/src/trace.serial.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/trace.simple.cpp b/examples/parallel_for/tachyon/src/trace.simple.cpp index db270e4..bf84930 100644 --- a/examples/parallel_for/tachyon/src/trace.simple.cpp +++ b/examples/parallel_for/tachyon/src/trace.simple.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/trace.tbb.cpp b/examples/parallel_for/tachyon/src/trace.tbb.cpp index 13761d5..b164dcb 100644 --- a/examples/parallel_for/tachyon/src/trace.tbb.cpp +++ b/examples/parallel_for/tachyon/src/trace.tbb.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/trace.tbb1d.cpp b/examples/parallel_for/tachyon/src/trace.tbb1d.cpp index 3ff9321..1dcb85f 100644 --- a/examples/parallel_for/tachyon/src/trace.tbb1d.cpp +++ b/examples/parallel_for/tachyon/src/trace.tbb1d.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/trace_rest.cpp b/examples/parallel_for/tachyon/src/trace_rest.cpp index 34864d4..20ada17 100644 --- a/examples/parallel_for/tachyon/src/trace_rest.cpp +++ b/examples/parallel_for/tachyon/src/trace_rest.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/triangle.cpp b/examples/parallel_for/tachyon/src/triangle.cpp index d80adce..da6c96f 100644 --- a/examples/parallel_for/tachyon/src/triangle.cpp +++ b/examples/parallel_for/tachyon/src/triangle.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/triangle.h b/examples/parallel_for/tachyon/src/triangle.h index b71ad5c..527d01d 100644 --- a/examples/parallel_for/tachyon/src/triangle.h +++ b/examples/parallel_for/tachyon/src/triangle.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/types.h b/examples/parallel_for/tachyon/src/types.h index d92fd63..2263077 100644 --- a/examples/parallel_for/tachyon/src/types.h +++ b/examples/parallel_for/tachyon/src/types.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/ui.cpp b/examples/parallel_for/tachyon/src/ui.cpp index 4ab2bbf..71d7e2b 100644 --- a/examples/parallel_for/tachyon/src/ui.cpp +++ b/examples/parallel_for/tachyon/src/ui.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/ui.h b/examples/parallel_for/tachyon/src/ui.h index fbd16da..ae11c15 100644 --- a/examples/parallel_for/tachyon/src/ui.h +++ b/examples/parallel_for/tachyon/src/ui.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/util.cpp b/examples/parallel_for/tachyon/src/util.cpp index 5c4999c..5b72692 100644 --- a/examples/parallel_for/tachyon/src/util.cpp +++ b/examples/parallel_for/tachyon/src/util.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/util.h b/examples/parallel_for/tachyon/src/util.h index 9be8316..111908a 100644 --- a/examples/parallel_for/tachyon/src/util.h +++ b/examples/parallel_for/tachyon/src/util.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/vector.cpp b/examples/parallel_for/tachyon/src/vector.cpp index 5438499..2f7b2a2 100644 --- a/examples/parallel_for/tachyon/src/vector.cpp +++ b/examples/parallel_for/tachyon/src/vector.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/vector.h b/examples/parallel_for/tachyon/src/vector.h index 2e5232f..722b63e 100644 --- a/examples/parallel_for/tachyon/src/vector.h +++ b/examples/parallel_for/tachyon/src/vector.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/vol.cpp b/examples/parallel_for/tachyon/src/vol.cpp index 489e6c5..aa5f7f6 100644 --- a/examples/parallel_for/tachyon/src/vol.cpp +++ b/examples/parallel_for/tachyon/src/vol.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/src/vol.h b/examples/parallel_for/tachyon/src/vol.h index bea9cd6..8331497 100644 --- a/examples/parallel_for/tachyon/src/vol.h +++ b/examples/parallel_for/tachyon/src/vol.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_for/tachyon/xcode/tachyon.xcodeproj/project.pbxproj b/examples/parallel_for/tachyon/xcode/tachyon.xcodeproj/project.pbxproj index c8e03c6..a29342e 100644 --- a/examples/parallel_for/tachyon/xcode/tachyon.xcodeproj/project.pbxproj +++ b/examples/parallel_for/tachyon/xcode/tachyon.xcodeproj/project.pbxproj @@ -1251,7 +1251,7 @@ 84011760152D6F6C00B07E4D /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 84011797152D6F8400B07E4D /* Build configuration list for PBXNativeTarget "tachyon.tbb1d" */ = { isa = XCConfigurationList; @@ -1260,7 +1260,7 @@ 84011799152D6F8400B07E4D /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 84D0174B1527431F0008A4E0 /* Build configuration list for PBXProject "tachyon" */ = { isa = XCConfigurationList; @@ -1269,7 +1269,7 @@ 84D01771152743200008A4E0 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 84D01772152743200008A4E0 /* Build configuration list for PBXNativeTarget "tachyon.tbb" */ = { isa = XCConfigurationList; @@ -1278,7 +1278,7 @@ 84D01774152743200008A4E0 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; D3E786C31C0E3588006995F1 /* Build configuration list for PBXNativeTarget "tachyon.tbb.ios" */ = { isa = XCConfigurationList; @@ -1287,7 +1287,7 @@ D3E786C21C0E3588006995F1 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/parallel_reduce/convex_hull/Makefile b/examples/parallel_reduce/convex_hull/Makefile index f2ef31d..92256ed 100644 --- a/examples/parallel_reduce/convex_hull/Makefile +++ b/examples/parallel_reduce/convex_hull/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/convex_hull/Makefile.windows b/examples/parallel_reduce/convex_hull/Makefile.windows index 3aaad81..8efec27 100644 --- a/examples/parallel_reduce/convex_hull/Makefile.windows +++ b/examples/parallel_reduce/convex_hull/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/convex_hull/convex_hull.h b/examples/parallel_reduce/convex_hull/convex_hull.h index 6806015..6f11fc1 100644 --- a/examples/parallel_reduce/convex_hull/convex_hull.h +++ b/examples/parallel_reduce/convex_hull/convex_hull.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/convex_hull/convex_hull_bench.cpp b/examples/parallel_reduce/convex_hull/convex_hull_bench.cpp index 6675008..43fb999 100644 --- a/examples/parallel_reduce/convex_hull/convex_hull_bench.cpp +++ b/examples/parallel_reduce/convex_hull/convex_hull_bench.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/convex_hull/convex_hull_sample.cpp b/examples/parallel_reduce/convex_hull/convex_hull_sample.cpp index 54a6753..8f2c725 100644 --- a/examples/parallel_reduce/convex_hull/convex_hull_sample.cpp +++ b/examples/parallel_reduce/convex_hull/convex_hull_sample.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/convex_hull/readme.html b/examples/parallel_reduce/convex_hull/readme.html index 741f1e8..55d6fd9 100644 --- a/examples/parallel_reduce/convex_hull/readme.html +++ b/examples/parallel_reduce/convex_hull/readme.html @@ -119,11 +119,11 @@ .circ { list-style-type:circle } - + .single { padding: 0 0.5em; } - + /* ------------------------------------------------- */ /* Table styles */ table{ @@ -150,9 +150,9 @@ } th{ border:1px #dddddd solid; - padding-top:2px; + padding-top:2px; padding-bottom:0px; - padding-right:3px; + padding-right:3px; padding-left:3px; } td{ @@ -225,7 +225,7 @@ padding-right:5px; vertical-align:top; } - + .specs { border-collapse:collapse; } @@ -242,7 +242,7 @@ padding: 0 0.2em 0.2em; text-align: center; } - .specs td tr:last-child td, + .specs td tr:last-child td, .specs td tr:last-child th { padding: 0 0.2em; } @@ -266,7 +266,7 @@ Intel® Threading Building Blocks. Convex_hull sample - +

- +

Parallel version of convex hull algorithm (quick hull).

@@ -324,7 +324,7 @@

- +
Files
@@ -341,7 +341,7 @@
- +
Directories
@@ -376,11 +376,11 @@
To run a short version of this example, e.g., for use with Intel® Threading Tools:
Build a debug version of the example (see the build instructions). -
Run it with a small problem size and the desired number of threads, e.g., convex_hull_sample 500000 4. +
Run it with a small problem size and the desired number of threads, e.g., convex_hull_sample 4 500000.
- +
Up to parent directory
@@ -390,11 +390,11 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
* Other names and brands may be claimed as the property of others. +
© 2019, Intel Corporation

- - + + diff --git a/examples/parallel_reduce/convex_hull/xcode/convex_hull.xcodeproj/project.pbxproj b/examples/parallel_reduce/convex_hull/xcode/convex_hull.xcodeproj/project.pbxproj index 49925d5..7803c73 100644 --- a/examples/parallel_reduce/convex_hull/xcode/convex_hull.xcodeproj/project.pbxproj +++ b/examples/parallel_reduce/convex_hull/xcode/convex_hull.xcodeproj/project.pbxproj @@ -324,7 +324,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "convex_hull" */ = { isa = XCConfigurationList; @@ -333,7 +333,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; A1F594EE0B8F4B8200073279 /* Build configuration list for PBXNativeTarget "convex_hull_bench" */ = { isa = XCConfigurationList; @@ -342,7 +342,7 @@ A1F594F20B8F4B8200073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/parallel_reduce/index.html b/examples/parallel_reduce/index.html index 9649de1..04149f7 100644 --- a/examples/parallel_reduce/index.html +++ b/examples/parallel_reduce/index.html @@ -337,7 +337,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_reduce/primes/Makefile b/examples/parallel_reduce/primes/Makefile index 731895b..db23458 100644 --- a/examples/parallel_reduce/primes/Makefile +++ b/examples/parallel_reduce/primes/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/primes/Makefile.windows b/examples/parallel_reduce/primes/Makefile.windows index f61d2ee..f3371f3 100644 --- a/examples/parallel_reduce/primes/Makefile.windows +++ b/examples/parallel_reduce/primes/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/primes/main.cpp b/examples/parallel_reduce/primes/main.cpp index 8357994..734225d 100644 --- a/examples/parallel_reduce/primes/main.cpp +++ b/examples/parallel_reduce/primes/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/primes/primes.cpp b/examples/parallel_reduce/primes/primes.cpp index 09f3a6e..25d6e17 100644 --- a/examples/parallel_reduce/primes/primes.cpp +++ b/examples/parallel_reduce/primes/primes.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/primes/primes.h b/examples/parallel_reduce/primes/primes.h index 3ae92e1..f260dfd 100644 --- a/examples/parallel_reduce/primes/primes.h +++ b/examples/parallel_reduce/primes/primes.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/parallel_reduce/primes/readme.html b/examples/parallel_reduce/primes/readme.html index 97120a0..564e6fd 100644 --- a/examples/parallel_reduce/primes/readme.html +++ b/examples/parallel_reduce/primes/readme.html @@ -398,7 +398,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/parallel_reduce/primes/xcode/primes.xcodeproj/project.pbxproj b/examples/parallel_reduce/primes/xcode/primes.xcodeproj/project.pbxproj index a3d8b61..9530f3b 100644 --- a/examples/parallel_reduce/primes/xcode/primes.xcodeproj/project.pbxproj +++ b/examples/parallel_reduce/primes/xcode/primes.xcodeproj/project.pbxproj @@ -251,7 +251,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "primes" */ = { isa = XCConfigurationList; @@ -260,7 +260,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/pipeline/index.html b/examples/pipeline/index.html index ec36081..92c013d 100644 --- a/examples/pipeline/index.html +++ b/examples/pipeline/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/pipeline/square/Makefile b/examples/pipeline/square/Makefile index d4037ec..3f1fddd 100644 --- a/examples/pipeline/square/Makefile +++ b/examples/pipeline/square/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/pipeline/square/Makefile.windows b/examples/pipeline/square/Makefile.windows index 0571c75..6390335 100644 --- a/examples/pipeline/square/Makefile.windows +++ b/examples/pipeline/square/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/pipeline/square/gen_input.cpp b/examples/pipeline/square/gen_input.cpp index f1690d5..7e0ea8b 100644 --- a/examples/pipeline/square/gen_input.cpp +++ b/examples/pipeline/square/gen_input.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/pipeline/square/readme.html b/examples/pipeline/square/readme.html index 11a5d64..7f2b267 100644 --- a/examples/pipeline/square/readme.html +++ b/examples/pipeline/square/readme.html @@ -408,7 +408,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/pipeline/square/square.cpp b/examples/pipeline/square/square.cpp index c15be31..3a6f6a5 100644 --- a/examples/pipeline/square/square.cpp +++ b/examples/pipeline/square/square.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/pipeline/square/xcode/square.xcodeproj/project.pbxproj b/examples/pipeline/square/xcode/square.xcodeproj/project.pbxproj index 57ea093..03611dd 100644 --- a/examples/pipeline/square/xcode/square.xcodeproj/project.pbxproj +++ b/examples/pipeline/square/xcode/square.xcodeproj/project.pbxproj @@ -249,7 +249,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "square" */ = { isa = XCConfigurationList; @@ -258,7 +258,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/task/index.html b/examples/task/index.html index bc5ec71..ceaa283 100644 --- a/examples/task/index.html +++ b/examples/task/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/task/tree_sum/Makefile b/examples/task/tree_sum/Makefile index f396e87..37f5238 100644 --- a/examples/task/tree_sum/Makefile +++ b/examples/task/tree_sum/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/Makefile.windows b/examples/task/tree_sum/Makefile.windows index b71167a..8fba35d 100644 --- a/examples/task/tree_sum/Makefile.windows +++ b/examples/task/tree_sum/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/OptimizedParallelSumTree.cpp b/examples/task/tree_sum/OptimizedParallelSumTree.cpp index a655258..67bd112 100644 --- a/examples/task/tree_sum/OptimizedParallelSumTree.cpp +++ b/examples/task/tree_sum/OptimizedParallelSumTree.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/SerialSumTree.cpp b/examples/task/tree_sum/SerialSumTree.cpp index 15d3976..0da9798 100644 --- a/examples/task/tree_sum/SerialSumTree.cpp +++ b/examples/task/tree_sum/SerialSumTree.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/SimpleParallelSumTree.cpp b/examples/task/tree_sum/SimpleParallelSumTree.cpp index 6923a7b..2743f57 100644 --- a/examples/task/tree_sum/SimpleParallelSumTree.cpp +++ b/examples/task/tree_sum/SimpleParallelSumTree.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/TreeMaker.h b/examples/task/tree_sum/TreeMaker.h index 029cbc2..594d98f 100644 --- a/examples/task/tree_sum/TreeMaker.h +++ b/examples/task/tree_sum/TreeMaker.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/common.h b/examples/task/tree_sum/common.h index ab152e5..fce116b 100644 --- a/examples/task/tree_sum/common.h +++ b/examples/task/tree_sum/common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/main.cpp b/examples/task/tree_sum/main.cpp index 2f6ba88..c4e5783 100644 --- a/examples/task/tree_sum/main.cpp +++ b/examples/task/tree_sum/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task/tree_sum/readme.html b/examples/task/tree_sum/readme.html index c2e7d5b..15ef086 100644 --- a/examples/task/tree_sum/readme.html +++ b/examples/task/tree_sum/readme.html @@ -414,7 +414,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/task/tree_sum/xcode/tree_sum.xcodeproj/project.pbxproj b/examples/task/tree_sum/xcode/tree_sum.xcodeproj/project.pbxproj index c0ad972..6cd2363 100644 --- a/examples/task/tree_sum/xcode/tree_sum.xcodeproj/project.pbxproj +++ b/examples/task/tree_sum/xcode/tree_sum.xcodeproj/project.pbxproj @@ -261,7 +261,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "tree_sum" */ = { isa = XCConfigurationList; @@ -270,7 +270,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/task_arena/fractal/Makefile b/examples/task_arena/fractal/Makefile index 6ed62ad..3793300 100644 --- a/examples/task_arena/fractal/Makefile +++ b/examples/task_arena/fractal/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/Makefile.windows b/examples/task_arena/fractal/Makefile.windows index 3327abd..09cdb33 100644 --- a/examples/task_arena/fractal/Makefile.windows +++ b/examples/task_arena/fractal/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/fractal.cpp b/examples/task_arena/fractal/fractal.cpp index b066d79..715eacc 100644 --- a/examples/task_arena/fractal/fractal.cpp +++ b/examples/task_arena/fractal/fractal.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/fractal.h b/examples/task_arena/fractal/fractal.h index 6712df7..7dc0aba 100644 --- a/examples/task_arena/fractal/fractal.h +++ b/examples/task_arena/fractal/fractal.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/fractal_video.h b/examples/task_arena/fractal/fractal_video.h index c9e0141..de1e2c4 100644 --- a/examples/task_arena/fractal/fractal_video.h +++ b/examples/task_arena/fractal/fractal_video.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/main.cpp b/examples/task_arena/fractal/main.cpp index ce8f01a..ab03ed9 100644 --- a/examples/task_arena/fractal/main.cpp +++ b/examples/task_arena/fractal/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/msvs/resource.h b/examples/task_arena/fractal/msvs/resource.h index 23e23a6..e52a401 100644 --- a/examples/task_arena/fractal/msvs/resource.h +++ b/examples/task_arena/fractal/msvs/resource.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task_arena/fractal/readme.html b/examples/task_arena/fractal/readme.html index c0538ac..b6ca4b5 100644 --- a/examples/task_arena/fractal/readme.html +++ b/examples/task_arena/fractal/readme.html @@ -438,7 +438,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj b/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj index 30fcb40..6f087b7 100644 --- a/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj +++ b/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj @@ -585,7 +585,7 @@ 84D01771152743200008A4E0 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 84D01772152743200008A4E0 /* Build configuration list for PBXNativeTarget "tbbExample" */ = { isa = XCConfigurationList; @@ -594,7 +594,7 @@ 84D01774152743200008A4E0 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; D31F32331C11796D00A77D54 /* Build configuration list for PBXNativeTarget "tbbExample_ios" */ = { isa = XCConfigurationList; @@ -603,7 +603,7 @@ D31F32321C11796D00A77D54 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/task_arena/index.html b/examples/task_arena/index.html index 21be30d..e244193 100644 --- a/examples/task_arena/index.html +++ b/examples/task_arena/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/task_group/index.html b/examples/task_group/index.html index b06191c..e95834e 100644 --- a/examples/task_group/index.html +++ b/examples/task_group/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/task_group/sudoku/Makefile b/examples/task_group/sudoku/Makefile index 07198e4..dd32a48 100644 --- a/examples/task_group/sudoku/Makefile +++ b/examples/task_group/sudoku/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/task_group/sudoku/Makefile.windows b/examples/task_group/sudoku/Makefile.windows index 21d74ab..e0b23de 100644 --- a/examples/task_group/sudoku/Makefile.windows +++ b/examples/task_group/sudoku/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/task_group/sudoku/readme.html b/examples/task_group/sudoku/readme.html index 5685ebf..bb157d5 100644 --- a/examples/task_group/sudoku/readme.html +++ b/examples/task_group/sudoku/readme.html @@ -408,7 +408,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/task_group/sudoku/sudoku.cpp b/examples/task_group/sudoku/sudoku.cpp index f797157..328339a 100644 --- a/examples/task_group/sudoku/sudoku.cpp +++ b/examples/task_group/sudoku/sudoku.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/task_group/sudoku/xcode/sudoku.xcodeproj/project.pbxproj b/examples/task_group/sudoku/xcode/sudoku.xcodeproj/project.pbxproj index 835c82c..694c16b 100644 --- a/examples/task_group/sudoku/xcode/sudoku.xcodeproj/project.pbxproj +++ b/examples/task_group/sudoku/xcode/sudoku.xcodeproj/project.pbxproj @@ -241,7 +241,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "sudoku" */ = { isa = XCConfigurationList; @@ -250,7 +250,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/test_all/fibonacci/Fibonacci.cpp b/examples/test_all/fibonacci/Fibonacci.cpp index b6a48c7..98c0da8 100644 --- a/examples/test_all/fibonacci/Fibonacci.cpp +++ b/examples/test_all/fibonacci/Fibonacci.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/test_all/fibonacci/Makefile b/examples/test_all/fibonacci/Makefile index 69c2fb6..a869f74 100644 --- a/examples/test_all/fibonacci/Makefile +++ b/examples/test_all/fibonacci/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/test_all/fibonacci/Makefile.windows b/examples/test_all/fibonacci/Makefile.windows index fd6ff53..ce825bb 100644 --- a/examples/test_all/fibonacci/Makefile.windows +++ b/examples/test_all/fibonacci/Makefile.windows @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/examples/test_all/fibonacci/readme.html b/examples/test_all/fibonacci/readme.html index b0a3aab..d8a5296 100644 --- a/examples/test_all/fibonacci/readme.html +++ b/examples/test_all/fibonacci/readme.html @@ -393,7 +393,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/examples/test_all/fibonacci/xcode/fibonacci.xcodeproj/project.pbxproj b/examples/test_all/fibonacci/xcode/fibonacci.xcodeproj/project.pbxproj index e8c14e5..09a61b7 100644 --- a/examples/test_all/fibonacci/xcode/fibonacci.xcodeproj/project.pbxproj +++ b/examples/test_all/fibonacci/xcode/fibonacci.xcodeproj/project.pbxproj @@ -247,7 +247,7 @@ A1F593C70B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "fibonacci" */ = { isa = XCConfigurationList; @@ -256,7 +256,7 @@ A1F593C90B8F0E6E00073279 /* Release64 */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug64; + defaultConfigurationName = Release64; }; /* End XCConfigurationList section */ }; diff --git a/examples/test_all/index.html b/examples/test_all/index.html index 764d60a..683652a 100644 --- a/examples/test_all/index.html +++ b/examples/test_all/index.html @@ -335,7 +335,7 @@

Intel and the Intel logo 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. -
© 2018, Intel Corporation +
© 2019, Intel Corporation

diff --git a/include/index.html b/include/index.html index 6fdf71c..7895ced 100644 --- a/include/index.html +++ b/include/index.html @@ -15,7 +15,7 @@ Include files for Intel® Threading Building Blocks (Intel® TBB).
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/include/serial/tbb/parallel_for.h b/include/serial/tbb/parallel_for.h index e5959c2..3c8c348 100644 --- a/include/serial/tbb/parallel_for.h +++ b/include/serial/tbb/parallel_for.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/serial/tbb/tbb_annotate.h b/include/serial/tbb/tbb_annotate.h index c16defe..c3b3306 100644 --- a/include/serial/tbb/tbb_annotate.h +++ b/include/serial/tbb/tbb_annotate.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/aggregator.h b/include/tbb/aggregator.h index e25f096..197d6ea 100644 --- a/include/tbb/aggregator.h +++ b/include/tbb/aggregator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/aligned_space.h b/include/tbb/aligned_space.h index f9e8e09..49497c1 100644 --- a/include/tbb/aligned_space.h +++ b/include/tbb/aligned_space.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/atomic.h b/include/tbb/atomic.h index 29c8525..9f79c8f 100644 --- a/include/tbb/atomic.h +++ b/include/tbb/atomic.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/blocked_range.h b/include/tbb/blocked_range.h index 3c754e5..b8fcadc 100644 --- a/include/tbb/blocked_range.h +++ b/include/tbb/blocked_range.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/blocked_range2d.h b/include/tbb/blocked_range2d.h index a33b0cd..81502cc 100644 --- a/include/tbb/blocked_range2d.h +++ b/include/tbb/blocked_range2d.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/blocked_range3d.h b/include/tbb/blocked_range3d.h index d3db48c..263f018 100644 --- a/include/tbb/blocked_range3d.h +++ b/include/tbb/blocked_range3d.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/blocked_rangeNd.h b/include/tbb/blocked_rangeNd.h index d63860b..a4fb658 100644 --- a/include/tbb/blocked_rangeNd.h +++ b/include/tbb/blocked_rangeNd.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Intel Corporation + Copyright (c) 2017-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/cache_aligned_allocator.h b/include/tbb/cache_aligned_allocator.h index de29f30..20c6350 100644 --- a/include/tbb/cache_aligned_allocator.h +++ b/include/tbb/cache_aligned_allocator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +24,11 @@ #include #include "tbb_stddef.h" #if __TBB_ALLOCATOR_CONSTRUCT_VARIADIC - #include // std::forward +#include // std::forward +#endif + +#if __TBB_CPP17_MEMORY_RESOURCE_PRESENT +#include #endif namespace tbb { @@ -69,7 +73,6 @@ public: template struct rebind { typedef cache_aligned_allocator other; }; - cache_aligned_allocator() throw() {} cache_aligned_allocator( const cache_aligned_allocator& ) throw() {} template cache_aligned_allocator(const cache_aligned_allocator&) throw() {} @@ -132,6 +135,79 @@ inline bool operator==( const cache_aligned_allocator&, const cache_aligned_a template inline bool operator!=( const cache_aligned_allocator&, const cache_aligned_allocator& ) {return false;} +#if __TBB_CPP17_MEMORY_RESOURCE_PRESENT + +//! C++17 memory resource wrapper to ensure cache line size alignment +class cache_aligned_resource : public std::pmr::memory_resource { +public: + cache_aligned_resource() : cache_aligned_resource(std::pmr::get_default_resource()) {} + explicit cache_aligned_resource(std::pmr::memory_resource* upstream) : m_upstream(upstream) {} + + std::pmr::memory_resource* upstream_resource() const { + return m_upstream; + } + +private: + //! We don't know what memory resource set. Use padding to gurantee alignment + void* do_allocate(size_t bytes, size_t alignment) override { + size_t cache_line_alignment = correct_alignment(alignment); + uintptr_t base = (uintptr_t)m_upstream->allocate(correct_size(bytes) + cache_line_alignment); + __TBB_ASSERT(base != 0, "Upstream resource returned NULL."); +#if _MSC_VER && !defined(__INTEL_COMPILER) + // unary minus operator applied to unsigned type, result still unsigned + #pragma warning(push) + #pragma warning(disable: 4146 4706) +#endif + // Round up to the next cache line (align the base address) + uintptr_t result = (base + cache_line_alignment) & -cache_line_alignment; +#if _MSC_VER && !defined(__INTEL_COMPILER) + #pragma warning(pop) +#endif + // Record where block actually starts. + ((uintptr_t*)result)[-1] = base; + return (void*)result; + } + + void do_deallocate(void* ptr, size_t bytes, size_t alignment) override { + if (ptr) { + // Recover where block actually starts + uintptr_t base = ((uintptr_t*)ptr)[-1]; + m_upstream->deallocate((void*)base, correct_size(bytes) + correct_alignment(alignment)); + } + } + + bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override { + if (this == &other) { return true; } +#if __TBB_USE_OPTIONAL_RTTI + const cache_aligned_resource* other_res = dynamic_cast(&other); + return other_res && (this->upstream_resource() == other_res->upstream_resource()); +#else + return false; +#endif + } + + size_t correct_alignment(size_t alignment) { + __TBB_ASSERT(tbb::internal::is_power_of_two(alignment), "Alignemnt is not a power of 2"); +#if __TBB_CPP17_HW_INTERFERENCE_SIZE_PRESENT + size_t cache_line_size = std::hardware_destructive_interference_size; +#else + size_t cache_line_size = internal::NFS_GetLineSize(); +#endif + return alignment < cache_line_size ? cache_line_size : alignment; + } + + size_t correct_size(size_t bytes) { + // To handle the case, when small size requested. There could be not + // enough space to store the original pointer. + return bytes < sizeof(uintptr_t) ? sizeof(uintptr_t) : bytes; + } + + std::pmr::memory_resource* m_upstream; +}; + +#endif /* __TBB_CPP17_MEMORY_RESOURCE_PRESENT */ + } // namespace tbb #endif /* __TBB_cache_aligned_allocator_H */ + diff --git a/include/tbb/combinable.h b/include/tbb/combinable.h index 485ef4e..d9debb9 100644 --- a/include/tbb/combinable.h +++ b/include/tbb/combinable.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/compat/condition_variable b/include/tbb/compat/condition_variable index 3ca1fef..a46ef6f 100644 --- a/include/tbb/compat/condition_variable +++ b/include/tbb/compat/condition_variable @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/compat/ppl.h b/include/tbb/compat/ppl.h index 24a1191..a0a072a 100644 --- a/include/tbb/compat/ppl.h +++ b/include/tbb/compat/ppl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/compat/thread b/include/tbb/compat/thread index 55801d4..aac4f09 100644 --- a/include/tbb/compat/thread +++ b/include/tbb/compat/thread @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/compat/tuple b/include/tbb/compat/tuple index fed7b9b..f696714 100644 --- a/include/tbb/compat/tuple +++ b/include/tbb/compat/tuple @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/concurrent_hash_map.h b/include/tbb/concurrent_hash_map.h index c9030e7..7371fab 100644 --- a/include/tbb/concurrent_hash_map.h +++ b/include/tbb/concurrent_hash_map.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,6 +34,8 @@ #include "tbb_exception.h" #include "tbb_profiling.h" #include "internal/_tbb_hash_compare_impl.h" +#include "internal/_template_helpers.h" +#include "internal/_allocator_traits.h" #if __TBB_INITIALIZER_LISTS_PRESENT #include #endif @@ -48,7 +50,7 @@ namespace tbb { namespace interface5 { - template, typename A = tbb_allocator > > + template, typename A = tbb_allocator > > class concurrent_hash_map; //! @cond INTERNAL @@ -554,7 +556,7 @@ public: protected: friend class const_accessor; struct node; - typedef typename Allocator::template rebind::other node_allocator_type; + typedef typename tbb::internal::allocator_rebind::type node_allocator_type; node_allocator_type my_allocator; HashCompare my_hash_compare; @@ -858,7 +860,7 @@ public: #if __TBB_CPP11_RVALUE_REF_PRESENT //! Move Assignment concurrent_hash_map& operator=( concurrent_hash_map &&table ) { - if(this != &table){ + if(this != &table) { typedef typename tbb::internal::allocator_traits::propagate_on_container_move_assignment pocma_t; if(pocma_t::value || this->my_allocator == table.my_allocator) { concurrent_hash_map trash (std::move(*this)); @@ -1135,6 +1137,33 @@ protected: } }; +#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT +namespace internal { +using namespace tbb::internal; + +template typename Map, typename Key, typename T, typename... Args> +using hash_map_t = Map< + Key, T, + std::conditional_t< (sizeof...(Args)>0) && !is_allocator_v< pack_element_t<0, Args...> >, + pack_element_t<0, Args...>, tbb_hash_compare >, + std::conditional_t< (sizeof...(Args)>0) && is_allocator_v< pack_element_t >, + pack_element_t, tbb_allocator > > +>; +} + +// Deduction guide for the constructor from two iterators and hash_compare/ allocator +template +concurrent_hash_map(I, I, Args...) +-> internal::hash_map_t,internal::iterator_mapped_t, Args...>; + +// Deduction guide for the constructor from an initializer_list and hash_compare/ allocator +// Deduction guide for an initializer_list, hash_compare and allocator is implicit +template +concurrent_hash_map(std::initializer_list>, CompareOrAllocator) +-> internal::hash_map_t; + +#endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */ + template bool concurrent_hash_map::lookup( bool op_insert, const Key &key, const T *t, const_accessor *result, bool write, node* (*allocate_node)(node_allocator_type& , const Key&, const T*), node *tmp_n ) { __TBB_ASSERT( !result || !result->my_node, NULL ); diff --git a/include/tbb/concurrent_lru_cache.h b/include/tbb/concurrent_lru_cache.h index 197fafe..e1e1607 100644 --- a/include/tbb/concurrent_lru_cache.h +++ b/include/tbb/concurrent_lru_cache.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/concurrent_priority_queue.h b/include/tbb/concurrent_priority_queue.h index ad4e85d..ea58ef3 100644 --- a/include/tbb/concurrent_priority_queue.h +++ b/include/tbb/concurrent_priority_queue.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/concurrent_queue.h b/include/tbb/concurrent_queue.h index 98b434b..3f8ebe5 100644 --- a/include/tbb/concurrent_queue.h +++ b/include/tbb/concurrent_queue.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #define __TBB_concurrent_queue_H #include "internal/_concurrent_queue_impl.h" +#include "internal/_allocator_traits.h" namespace tbb { @@ -36,7 +37,7 @@ class concurrent_queue: public internal::concurrent_queue_base_v3 { template friend class internal::concurrent_queue_iterator; //! Allocator type - typedef typename A::template rebind::other page_allocator_type; + typedef typename tbb::internal::allocator_rebind::type page_allocator_type; page_allocator_type my_allocator; //! Allocates a block of size n (bytes) @@ -209,9 +210,9 @@ void concurrent_queue::clear() { template > class concurrent_bounded_queue: public internal::concurrent_queue_base_v8 { template friend class internal::concurrent_queue_iterator; + typedef typename tbb::internal::allocator_rebind::type page_allocator_type; //! Allocator type - typedef typename A::template rebind::other page_allocator_type; page_allocator_type my_allocator; typedef typename concurrent_queue_base_v3::padded_page padded_page; diff --git a/include/tbb/concurrent_unordered_map.h b/include/tbb/concurrent_unordered_map.h index d8d1d70..45bb24e 100644 --- a/include/tbb/concurrent_unordered_map.h +++ b/include/tbb/concurrent_unordered_map.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ #ifndef __TBB_concurrent_unordered_map_H #define __TBB_concurrent_unordered_map_H +#include "internal/_template_helpers.h" #include "internal/_concurrent_unordered_impl.h" namespace tbb @@ -39,7 +40,8 @@ protected: typedef std::pair value_type; typedef Key key_type; typedef Hash_compare hash_compare; - typedef typename Allocator::template rebind::other allocator_type; + typedef typename tbb::internal::allocator_rebind::type allocator_type; + enum { allow_multimapping = Allow_multimapping }; concurrent_unordered_map_traits() : my_hash_compare() {} @@ -228,6 +230,45 @@ public: } }; +#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT + +namespace internal { +using namespace tbb::internal; + +template typename Map, typename Key, typename Element, typename... Args> +using cu_map_t = Map< + Key, Element, + std::conditional_t< (sizeof...(Args)>0) && !is_allocator_v< pack_element_t<0, Args...> >, + pack_element_t<0, Args...>, tbb_hash >, + std::conditional_t< (sizeof...(Args)>1) && !is_allocator_v< pack_element_t<1, Args...> >, + pack_element_t<1, Args...>, std::equal_to >, + std::conditional_t< (sizeof...(Args)>0) && is_allocator_v< pack_element_t >, + pack_element_t, tbb_allocator > > +>; +} + +// Deduction guide for the constructor from two iterators +template +concurrent_unordered_map (I, I) +-> internal::cu_map_t, internal::iterator_mapped_t>; + +// Deduction guide for the constructor from two iterators and hasher/equality/allocator +template +concurrent_unordered_map(I, I, size_t, Args...) +-> internal::cu_map_t, internal::iterator_mapped_t, Args...>; + +// Deduction guide for the constructor from an initializer_list +template +concurrent_unordered_map(std::initializer_list>) +-> internal::cu_map_t; + +// Deduction guide for the constructor from an initializer_list and hasher/equality/allocator +template +concurrent_unordered_map(std::initializer_list>, size_t, Args...) +-> internal::cu_map_t; + +#endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */ + template < typename Key, typename T, typename Hasher = tbb::tbb_hash, typename Key_equality = std::equal_to, typename Allocator = tbb::tbb_allocator > > class concurrent_unordered_multimap : @@ -363,6 +404,30 @@ public: : base_type(table, a) {} }; + +#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT + +// Deduction guide for the constructor from two iterators +template +concurrent_unordered_multimap (I, I) +-> internal::cu_map_t, internal::iterator_mapped_t>; + +// Deduction guide for the constructor from two iterators and hasher/equality/allocator +template +concurrent_unordered_multimap(I, I, size_t, Args...) +-> internal::cu_map_t, internal::iterator_mapped_t, Args...>; + +// Deduction guide for the constructor from an initializer_list +template +concurrent_unordered_multimap(std::initializer_list>) +-> internal::cu_map_t; + +// Deduction guide for the constructor from an initializer_list and hasher/equality/allocator +template +concurrent_unordered_multimap(std::initializer_list>, size_t, Args...) +-> internal::cu_map_t; + +#endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */ } // namespace interface5 using interface5::concurrent_unordered_map; diff --git a/include/tbb/concurrent_unordered_set.h b/include/tbb/concurrent_unordered_set.h index f8e8387..cdcecda 100644 --- a/include/tbb/concurrent_unordered_set.h +++ b/include/tbb/concurrent_unordered_set.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ #ifndef __TBB_concurrent_unordered_set_H #define __TBB_concurrent_unordered_set_H +#include "internal/_template_helpers.h" #include "internal/_concurrent_unordered_impl.h" namespace tbb @@ -39,7 +40,8 @@ protected: typedef Key value_type; typedef Key key_type; typedef Hash_compare hash_compare; - typedef typename Allocator::template rebind::other allocator_type; + typedef typename tbb::internal::allocator_rebind::type allocator_type; + enum { allow_multimapping = Allow_multimapping }; concurrent_unordered_set_traits() : my_hash_compare() {} @@ -182,6 +184,45 @@ public: }; +#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT + +namespace internal { +using namespace tbb::internal; + +template typename Set, typename T, typename... Args> +using cu_set_t = Set < + T, + std::conditional_t< (sizeof...(Args)>0) && !is_allocator_v< pack_element_t<0, Args...> >, + pack_element_t<0, Args...>, tbb_hash >, + std::conditional_t< (sizeof...(Args)>1) && !is_allocator_v< pack_element_t<1, Args...> >, + pack_element_t<1, Args...>, std::equal_to >, + std::conditional_t< (sizeof...(Args)>0) && is_allocator_v< pack_element_t >, + pack_element_t, tbb_allocator > +>; +} + +// Deduction guide for the constructor from two iterators +template +concurrent_unordered_set(I, I) +-> internal::cu_set_t>; + +// Deduction guide for the constructor from two iterators and hasher/equality/allocator +template +concurrent_unordered_set(I, I, size_t, Args...) +-> internal::cu_set_t, Args...>; + +// Deduction guide for the constructor from an initializer_list +template +concurrent_unordered_set(std::initializer_list) +-> internal::cu_set_t; + +// Deduction guide for the constructor from an initializer_list and hasher/equality/allocator +template +concurrent_unordered_set(std::initializer_list, size_t, Args...) +-> internal::cu_set_t; + +#endif /*__TBB_CPP17_DEDUCTION_GUIDES_PRESENT */ + template , typename Key_equality = std::equal_to, typename Allocator = tbb::tbb_allocator > class concurrent_unordered_multiset : @@ -319,6 +360,30 @@ public: : base_type(table, a) {} }; + +#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT + +// Deduction guide for the constructor from two iterators +template +concurrent_unordered_multiset(I, I) +-> internal::cu_set_t>; + +// Deduction guide for the constructor from two iterators and hasher/equality/allocator +template +concurrent_unordered_multiset(I, I, size_t, Args...) +-> internal::cu_set_t, Args...>; + +// Deduction guide for the constructor from an initializer_list +template +concurrent_unordered_multiset(std::initializer_list) +-> internal::cu_set_t; + +// Deduction guide for the constructor from an initializer_list and hasher/equality/allocator +template +concurrent_unordered_multiset(std::initializer_list, size_t, Args...) +-> internal::cu_set_t; + +#endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */ } // namespace interface5 using interface5::concurrent_unordered_set; diff --git a/include/tbb/concurrent_vector.h b/include/tbb/concurrent_vector.h index e4a9448..5c94583 100644 --- a/include/tbb/concurrent_vector.h +++ b/include/tbb/concurrent_vector.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,6 +34,8 @@ #include #include +#include "internal/_allocator_traits.h" + #if _MSC_VER==1500 && !__INTEL_COMPILER // VS2008/VC9 seems to have an issue; limits pull in math.h #pragma warning( push ) @@ -467,12 +469,9 @@ public: template class allocator_base { public: - typedef typename A::template - rebind::other allocator_type; + typedef typename tbb::internal::allocator_rebind::type allocator_type; allocator_type my_allocator; - allocator_base(const allocator_type &a = allocator_type() ) : my_allocator(a) {} - }; } // namespace internal @@ -742,9 +741,7 @@ public: if(pocma_t::value || this->my_allocator == other.my_allocator) { concurrent_vector trash (std::move(*this)); internal_swap(other); - if (pocma_t::value) { - this->my_allocator = std::move(other.my_allocator); - } + tbb::internal::allocator_move_assignment(this->my_allocator, other.my_allocator, pocma_t()); } else { internal_assign(other, sizeof(T), &destroy_array, &move_assign_array, &move_array); } @@ -1002,10 +999,10 @@ public: //! swap two instances void swap(concurrent_vector &vector) { - using std::swap; - if( this != &vector ) { + typedef typename tbb::internal::allocator_traits::propagate_on_container_swap pocs_t; + if( this != &vector && (this->my_allocator == vector.my_allocator || pocs_t::value) ) { concurrent_vector_base_v3::internal_swap(static_cast(vector)); - swap(this->my_allocator, vector.my_allocator); + tbb::internal::allocator_swap(this->my_allocator, vector.my_allocator, pocs_t()); } } @@ -1042,7 +1039,13 @@ private: internal_resize( n, sizeof(T), max_size(), static_cast(p), &destroy_array, p? &initialize_array_by : &initialize_array ); } - //! helper class + //! True/false function override helper + /* Functions declarations: + * void foo(is_integer_tag*); + * void foo(is_integer_tag*); + * Usage example: + * foo(static_cast::is_integer>*>(0)); + */ template class is_integer_tag; //! assign integer items by copying when arguments are treated as iterators. See C++ Standard 2003 23.1.1p9 diff --git a/include/tbb/critical_section.h b/include/tbb/critical_section.h index 8c4c9c7..13dc414 100644 --- a/include/tbb/critical_section.h +++ b/include/tbb/critical_section.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/enumerable_thread_specific.h b/include/tbb/enumerable_thread_specific.h index cd9c18a..d12a178 100644 --- a/include/tbb/enumerable_thread_specific.h +++ b/include/tbb/enumerable_thread_specific.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/flow_graph.h b/include/tbb/flow_graph.h index ee8c39d..0a5cfc0 100644 --- a/include/tbb/flow_graph.h +++ b/include/tbb/flow_graph.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/flow_graph_abstractions.h b/include/tbb/flow_graph_abstractions.h index 890ce76..bfb1e6b 100644 --- a/include/tbb/flow_graph_abstractions.h +++ b/include/tbb/flow_graph_abstractions.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/flow_graph_opencl_node.h b/include/tbb/flow_graph_opencl_node.h index 6c24900..4a363f8 100644 --- a/include/tbb/flow_graph_opencl_node.h +++ b/include/tbb/flow_graph_opencl_node.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/gfx_factory.h b/include/tbb/gfx_factory.h index f2a70c5..d00360d 100644 --- a/include/tbb/gfx_factory.h +++ b/include/tbb/gfx_factory.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/global_control.h b/include/tbb/global_control.h index 7a8d0c3..0c9a23c 100644 --- a/include/tbb/global_control.h +++ b/include/tbb/global_control.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,10 +21,6 @@ #ifndef __TBB_global_control_H #define __TBB_global_control_H -#if !TBB_PREVIEW_GLOBAL_CONTROL && !__TBB_BUILD -#error Set TBB_PREVIEW_GLOBAL_CONTROL before including global_control.h -#endif - #include "tbb_stddef.h" namespace tbb { diff --git a/include/tbb/index.html b/include/tbb/index.html index ad157bb..7bbb672 100644 --- a/include/tbb/index.html +++ b/include/tbb/index.html @@ -19,7 +19,7 @@ Include files for Intel® Threading Building Blocks classes and functions.
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/include/tbb/internal/_aggregator_impl.h b/include/tbb/internal/_aggregator_impl.h index 2a85da6..420162e 100644 --- a/include/tbb/internal/_aggregator_impl.h +++ b/include/tbb/internal/_aggregator_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_allocator_traits.h b/include/tbb/internal/_allocator_traits.h new file mode 100644 index 0000000..ee11beb --- /dev/null +++ b/include/tbb/internal/_allocator_traits.h @@ -0,0 +1,113 @@ +/* + Copyright (c) 2019 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. + + + + +*/ + +#ifndef __TBB_allocator_traits_H +#define __TBB_allocator_traits_H + +#include "../tbb_stddef.h" // true/false_type + +#if __TBB_ALLOCATOR_TRAITS_PRESENT +#include // for allocator_traits +#endif + +#if __TBB_CPP11_RVALUE_REF_PRESENT +#include // for std::move +#endif + +// For allocator_swap helper +#include __TBB_STD_SWAP_HEADER + +namespace tbb { +namespace internal { + +//! Internal implementation of allocator traits, propagate_on_* use internal boolean_constant. +//! In order to avoid code duplication, check what implementation of boolean constant will likely be passed. +#if __TBB_ALLOCATOR_TRAITS_PRESENT +typedef std::true_type traits_true_type; +typedef std::false_type traits_false_type; +#else +typedef tbb::internal::true_type traits_true_type; +typedef tbb::internal::false_type traits_false_type; +#endif + +#if __TBB_CPP11_RVALUE_REF_PRESENT +//! Move assignment implementation for allocator if propagate_on_container_move_assignment == true_type. +//! Noop if pocma == false_type. +template +inline void allocator_move_assignment(MyAlloc& my_allocator, OtherAlloc& other_allocator, traits_true_type) { + my_allocator = std::move(other_allocator); +} +template +inline void allocator_move_assignment(MyAlloc&, OtherAlloc&, traits_false_type) { /* NO MOVE */ } +#endif + +//! Swap implementation for allocators if propagate_on_container_swap == true_type. +//! Noop if pocs == false_type. +template +inline void allocator_swap(MyAlloc& my_allocator, OtherAlloc& other_allocator, traits_true_type) { + using std::swap; + swap(my_allocator, other_allocator); +} +template +inline void allocator_swap(MyAlloc&, OtherAlloc&, traits_false_type) { /* NO SWAP */ } + +#if __TBB_ALLOCATOR_TRAITS_PRESENT +using std::allocator_traits; +#else +//! Internal allocator_traits implementation, which relies on C++03 standard +//! [20.1.5] allocator requirements +template +struct allocator_traits { + // C++03 allocator doesn't have to be assignable or swappable, therefore + // define these traits as false_type to do not require additional operations + // that are not supposed to be in. + typedef tbb::internal::false_type propagate_on_container_move_assignment; + typedef tbb::internal::false_type propagate_on_container_copy_assignment; + typedef tbb::internal::false_type propagate_on_container_swap; + + typedef Alloc allocator_type; + typedef typename allocator_type::value_type value_type; + + typedef typename allocator_type::pointer pointer; + typedef typename allocator_type::const_pointer const_pointer; + typedef typename allocator_type::difference_type difference_type; + typedef typename allocator_type::size_type size_type; + + template struct rebind_alloc { + typedef typename Alloc::template rebind::other other; + }; +}; +#endif // __TBB_ALLOCATOR_TRAITS_PRESENT + +//! C++03/C++11 compliant rebind helper, even if no std::allocator_traits available +//! or rebind is not defined for allocator type +template +struct allocator_rebind { +#if __TBB_ALLOCATOR_TRAITS_PRESENT + typedef typename allocator_traits::template rebind_alloc type; +#else + typedef typename allocator_traits::template rebind_alloc::other type; +#endif +}; + +}} // namespace tbb::internal + +#endif // __TBB_allocator_traits_H + diff --git a/include/tbb/internal/_concurrent_queue_impl.h b/include/tbb/internal/_concurrent_queue_impl.h index 172588a..2f7c292 100644 --- a/include/tbb/internal/_concurrent_queue_impl.h +++ b/include/tbb/internal/_concurrent_queue_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_concurrent_unordered_impl.h b/include/tbb/internal/_concurrent_unordered_impl.h index 2e68e2f..2a0fbfb 100644 --- a/include/tbb/internal/_concurrent_unordered_impl.h +++ b/include/tbb/internal/_concurrent_unordered_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -44,6 +44,7 @@ #include #endif +#include "_allocator_traits.h" #include "_tbb_hash_compare_impl.h" namespace tbb { @@ -185,17 +186,20 @@ class split_ordered_list { public: typedef split_ordered_list self_type; - typedef typename Allocator::template rebind::other allocator_type; + + typedef typename tbb::internal::allocator_rebind::type allocator_type; + struct node; typedef node *nodeptr_t; - typedef typename allocator_type::size_type size_type; - typedef typename allocator_type::difference_type difference_type; - typedef typename allocator_type::pointer pointer; - typedef typename allocator_type::const_pointer const_pointer; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; - typedef typename allocator_type::value_type value_type; + typedef typename tbb::internal::allocator_traits::value_type value_type; + typedef typename tbb::internal::allocator_traits::size_type size_type; + typedef typename tbb::internal::allocator_traits::difference_type difference_type; + typedef typename tbb::internal::allocator_traits::pointer pointer; + typedef typename tbb::internal::allocator_traits::const_pointer const_pointer; + // No support for reference/const_reference in allocator traits + typedef value_type& reference; + typedef const value_type& const_reference; typedef solist_iterator const_iterator; typedef solist_iterator iterator; @@ -639,7 +643,7 @@ private: #endif } - typename allocator_type::template rebind::other my_node_allocator; // allocator object for nodes + typename tbb::internal::allocator_rebind::type my_node_allocator; // allocator object for nodes size_type my_element_count; // Total item count, not counting dummy nodes nodeptr_t my_head; // pointer to head node }; @@ -661,12 +665,15 @@ protected: typedef typename Traits::allocator_type allocator_type; typedef typename hash_compare::hasher hasher; typedef typename hash_compare::key_equal key_equal; - typedef typename allocator_type::pointer pointer; - typedef typename allocator_type::const_pointer const_pointer; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; - typedef typename allocator_type::size_type size_type; - typedef typename allocator_type::difference_type difference_type; + + typedef typename tbb::internal::allocator_traits::size_type size_type; + typedef typename tbb::internal::allocator_traits::difference_type difference_type; + typedef typename tbb::internal::allocator_traits::pointer pointer; + typedef typename tbb::internal::allocator_traits::const_pointer const_pointer; + // No support for reference/const_reference in allocator + typedef typename allocator_type::value_type& reference; + typedef const typename allocator_type::value_type& const_reference; + typedef split_ordered_list solist_t; typedef typename solist_t::nodeptr_t nodeptr_t; // Iterators that walk the entire split-order list, including dummy nodes @@ -1507,7 +1514,7 @@ private: // Shared variables atomic my_number_of_buckets; // Current table size solist_t my_solist; // List where all the elements are kept - typename allocator_type::template rebind::other my_allocator; // Allocator object for segments + typename tbb::internal::allocator_rebind::type my_allocator; // Allocator object for segments float my_maximum_bucket_size; // Maximum size of the bucket atomic my_buckets[pointers_per_table]; // The segment table }; diff --git a/include/tbb/internal/_flow_graph_async_msg_impl.h b/include/tbb/internal/_flow_graph_async_msg_impl.h index cb24998..f7a734a 100644 --- a/include/tbb/internal/_flow_graph_async_msg_impl.h +++ b/include/tbb/internal/_flow_graph_async_msg_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_body_impl.h b/include/tbb/internal/_flow_graph_body_impl.h index 25380a9..45b7f1c 100644 --- a/include/tbb/internal/_flow_graph_body_impl.h +++ b/include/tbb/internal/_flow_graph_body_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -367,6 +367,9 @@ public: : continue_receiver( __TBB_FLOW_GRAPH_PRIORITY_ARG1(number_of_predecessors, tbb::flow::internal::no_priority) ) + // Since decrementer does not make use of possibly unconstructed owner inside its + // constructor, my_node can be directly initialized with 'this' pointer passed from the + // owner, hence making method 'set_owner' needless. , my_node(NULL) {} void set_owner( T *node ) { my_node = node; } diff --git a/include/tbb/internal/_flow_graph_cache_impl.h b/include/tbb/internal/_flow_graph_cache_impl.h index de22b8c..62f829d 100644 --- a/include/tbb/internal/_flow_graph_cache_impl.h +++ b/include/tbb/internal/_flow_graph_cache_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_impl.h b/include/tbb/internal/_flow_graph_impl.h index 0aadf44..ed1e25c 100644 --- a/include/tbb/internal/_flow_graph_impl.h +++ b/include/tbb/internal/_flow_graph_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_indexer_impl.h b/include/tbb/internal/_flow_graph_indexer_impl.h index 01a6fd3..28048aa 100644 --- a/include/tbb/internal/_flow_graph_indexer_impl.h +++ b/include/tbb/internal/_flow_graph_indexer_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_item_buffer_impl.h b/include/tbb/internal/_flow_graph_item_buffer_impl.h index 546d264..7269fa0 100644 --- a/include/tbb/internal/_flow_graph_item_buffer_impl.h +++ b/include/tbb/internal/_flow_graph_item_buffer_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_join_impl.h b/include/tbb/internal/_flow_graph_join_impl.h index bd2fe64..755e103 100644 --- a/include/tbb/internal/_flow_graph_join_impl.h +++ b/include/tbb/internal/_flow_graph_join_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_node_impl.h b/include/tbb/internal/_flow_graph_node_impl.h index 7ed776a..a000464 100644 --- a/include/tbb/internal/_flow_graph_node_impl.h +++ b/include/tbb/internal/_flow_graph_node_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_streaming_node.h b/include/tbb/internal/_flow_graph_streaming_node.h index dae3e7a..6a0f572 100644 --- a/include/tbb/internal/_flow_graph_streaming_node.h +++ b/include/tbb/internal/_flow_graph_streaming_node.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_tagged_buffer_impl.h b/include/tbb/internal/_flow_graph_tagged_buffer_impl.h index e054626..1f3797f 100644 --- a/include/tbb/internal/_flow_graph_tagged_buffer_impl.h +++ b/include/tbb/internal/_flow_graph_tagged_buffer_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_trace_impl.h b/include/tbb/internal/_flow_graph_trace_impl.h index 68ca515..957513d 100644 --- a/include/tbb/internal/_flow_graph_trace_impl.h +++ b/include/tbb/internal/_flow_graph_trace_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_flow_graph_types_impl.h b/include/tbb/internal/_flow_graph_types_impl.h index e2d1c9f..688f1fa 100644 --- a/include/tbb/internal/_flow_graph_types_impl.h +++ b/include/tbb/internal/_flow_graph_types_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_mutex_padding.h b/include/tbb/internal/_mutex_padding.h index 8d098a4..dcf940a 100644 --- a/include/tbb/internal/_mutex_padding.h +++ b/include/tbb/internal/_mutex_padding.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_range_iterator.h b/include/tbb/internal/_range_iterator.h index 68ae28f..aeec190 100644 --- a/include/tbb/internal/_range_iterator.h +++ b/include/tbb/internal/_range_iterator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_tbb_hash_compare_impl.h b/include/tbb/internal/_tbb_hash_compare_impl.h index 2bcbded..098312d 100644 --- a/include/tbb/internal/_tbb_hash_compare_impl.h +++ b/include/tbb/internal/_tbb_hash_compare_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_tbb_strings.h b/include/tbb/internal/_tbb_strings.h index 6172bc4..049a6b9 100644 --- a/include/tbb/internal/_tbb_strings.h +++ b/include/tbb/internal/_tbb_strings.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_tbb_trace_impl.h b/include/tbb/internal/_tbb_trace_impl.h index 24021d0..964ec5a 100644 --- a/include/tbb/internal/_tbb_trace_impl.h +++ b/include/tbb/internal/_tbb_trace_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_tbb_windef.h b/include/tbb/internal/_tbb_windef.h index 938c949..9a5eadc 100644 --- a/include/tbb/internal/_tbb_windef.h +++ b/include/tbb/internal/_tbb_windef.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_template_helpers.h b/include/tbb/internal/_template_helpers.h index 09af157..6a299bc 100644 --- a/include/tbb/internal/_template_helpers.h +++ b/include/tbb/internal/_template_helpers.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 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,6 +23,14 @@ #include #include +#include "../tbb_config.h" +#if __TBB_CPP11_VARIADIC_TEMPLATES_PRESENT && __TBB_CPP11_TEMPLATE_ALIASES_PRESENT +#include +#endif +#if __TBB_CPP11_PRESENT +#include +#include // allocator_traits +#endif namespace tbb { namespace internal { @@ -65,6 +73,19 @@ template struct is_ref { static const bool value = true; }; template struct void_t { typedef void type; }; #endif +#if __TBB_CPP11_VARIADIC_TEMPLATES_PRESENT && __TBB_CPP11_TEMPLATE_ALIASES_PRESENT + +// Generic SFINAE helper for expression checks, based on the idea demonstrated in ISO C++ paper n4502 +template class... Checks> +struct supports_impl { typedef std::false_type type; }; +template class... Checks> +struct supports_impl...>::type, Checks...> { typedef std::true_type type; }; + +template class... Checks> +using supports = typename supports_impl::type; + +#endif /* __TBB_CPP11_VARIADIC_TEMPLATES_PRESENT && __TBB_CPP11_TEMPLATE_ALIASES_PRESENT */ + #if __TBB_CPP11_RVALUE_REF_PRESENT && __TBB_CPP11_VARIADIC_TEMPLATES_PRESENT //! Allows to store a function parameter pack as a variable and later pass it to another function @@ -176,6 +197,53 @@ using make_index_sequence = typename tbb::internal::make_index_sequence_impl: #endif /* __TBB_CPP14_INTEGER_SEQUENCE_PRESENT */ +#if __TBB_CPP11_PRESENT + +template< typename Iter > +using iterator_value_t = typename std::iterator_traits::value_type; + +template< typename Iter > +using iterator_key_t = typename std::remove_const::first_type>::type; + +template< typename Iter > +using iterator_mapped_t = typename iterator_value_t::second_type; + +template< typename A > using value_type = typename A::value_type; +template< typename A > using alloc_ptr_t = typename std::allocator_traits::pointer; +template< typename A > using has_allocate = decltype(std::declval&>() = std::declval().allocate(0)); +template< typename A > using has_deallocate = decltype(std::declval().deallocate(std::declval>(), 0)); + +// value_type should be checked first because it can be used in other checks (via allocator_traits) +template< typename T > +using is_allocator = supports; + +#if __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT + +template< typename T > +static constexpr bool is_allocator_v = is_allocator::value; + +#endif /*__TBB_CPP14_VARIABLE_TEMPLATES */ + +template< std::size_t N, typename... Args > +struct pack_element { + using type = void; +}; + +template< std::size_t N, typename T, typename... Args > +struct pack_element { + using type = typename pack_element::type; +}; + +template< typename T, typename... Args > +struct pack_element<0, T, Args...> { + using type = T; +}; + +template< std::size_t N, typename... Args > +using pack_element_t = typename pack_element::type; + +#endif /* __TBB_CPP11_PRESENT */ + } } // namespace internal, namespace tbb #endif /* __TBB_template_helpers_H */ diff --git a/include/tbb/internal/_x86_eliding_mutex_impl.h b/include/tbb/internal/_x86_eliding_mutex_impl.h index f011799..52b0cc0 100644 --- a/include/tbb/internal/_x86_eliding_mutex_impl.h +++ b/include/tbb/internal/_x86_eliding_mutex_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/internal/_x86_rtm_rw_mutex_impl.h b/include/tbb/internal/_x86_rtm_rw_mutex_impl.h index c268b93..b7ff582 100644 --- a/include/tbb/internal/_x86_rtm_rw_mutex_impl.h +++ b/include/tbb/internal/_x86_rtm_rw_mutex_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/iterators.h b/include/tbb/iterators.h index 85b3032..5967db5 100644 --- a/include/tbb/iterators.h +++ b/include/tbb/iterators.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Intel Corporation + Copyright (c) 2017-2019 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,6 +35,7 @@ namespace tbb { template class counting_iterator { + __TBB_STATIC_ASSERT(std::numeric_limits::is_integer, "Cannot instantiate counting_iterator with a non-integer type"); public: typedef typename std::make_signed::type difference_type; typedef IntType value_type; @@ -42,7 +43,8 @@ public: typedef const IntType& reference; typedef std::random_access_iterator_tag iterator_category; - explicit counting_iterator(IntType init): my_counter(init) { __TBB_STATIC_ASSERT(std::numeric_limits::is_integer, "Integer required."); } + counting_iterator(): my_counter() {} + explicit counting_iterator(IntType init): my_counter(init) {} reference operator*() const { return my_counter; } value_type operator[](difference_type i) const { return *(*this + i); } @@ -124,6 +126,7 @@ struct make_references { template class zip_iterator { + __TBB_STATIC_ASSERT(sizeof...(Types), "Cannot instantiate zip_iterator with empty template parameter pack"); static const std::size_t num_types = sizeof...(Types); typedef typename std::tuple it_types; public: @@ -133,7 +136,13 @@ public: typedef std::tuple::pointer...> pointer; typedef std::random_access_iterator_tag iterator_category; + zip_iterator(): my_it() {} explicit zip_iterator(Types... args): my_it(std::make_tuple(args...)) {} + zip_iterator(const zip_iterator& input) : my_it(input.my_it) {} + zip_iterator& operator=(const zip_iterator& input) { + my_it = input.my_it; + return *this; + } reference operator*() const { return tbb::internal::make_references()(my_it, tbb::internal::make_index_sequence()); diff --git a/include/tbb/machine/gcc_arm.h b/include/tbb/machine/gcc_arm.h index 7fac0f2..3a67fde 100644 --- a/include/tbb/machine/gcc_arm.h +++ b/include/tbb/machine/gcc_arm.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/gcc_generic.h b/include/tbb/machine/gcc_generic.h index 390c1c2..740cfd3 100644 --- a/include/tbb/machine/gcc_generic.h +++ b/include/tbb/machine/gcc_generic.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/gcc_ia32_common.h b/include/tbb/machine/gcc_ia32_common.h index 7ace018..921f00f 100644 --- a/include/tbb/machine/gcc_ia32_common.h +++ b/include/tbb/machine/gcc_ia32_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/gcc_itsx.h b/include/tbb/machine/gcc_itsx.h index 78b1a96..1b7a962 100644 --- a/include/tbb/machine/gcc_itsx.h +++ b/include/tbb/machine/gcc_itsx.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/ibm_aix51.h b/include/tbb/machine/ibm_aix51.h index 961d88b..229eb44 100644 --- a/include/tbb/machine/ibm_aix51.h +++ b/include/tbb/machine/ibm_aix51.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/icc_generic.h b/include/tbb/machine/icc_generic.h index 1307741..33f6c0a 100644 --- a/include/tbb/machine/icc_generic.h +++ b/include/tbb/machine/icc_generic.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/linux_common.h b/include/tbb/machine/linux_common.h index 7c5e034..d803845 100644 --- a/include/tbb/machine/linux_common.h +++ b/include/tbb/machine/linux_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/linux_ia32.h b/include/tbb/machine/linux_ia32.h index 917c957..99dd2b6 100644 --- a/include/tbb/machine/linux_ia32.h +++ b/include/tbb/machine/linux_ia32.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/linux_ia64.h b/include/tbb/machine/linux_ia64.h index 0510ecc..739f971 100644 --- a/include/tbb/machine/linux_ia64.h +++ b/include/tbb/machine/linux_ia64.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/linux_intel64.h b/include/tbb/machine/linux_intel64.h index 5bd491d..8572e5d 100644 --- a/include/tbb/machine/linux_intel64.h +++ b/include/tbb/machine/linux_intel64.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/mac_ppc.h b/include/tbb/machine/mac_ppc.h index f68091f..a61294c 100644 --- a/include/tbb/machine/mac_ppc.h +++ b/include/tbb/machine/mac_ppc.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/macos_common.h b/include/tbb/machine/macos_common.h index 0b7dd37..b73f7a1 100644 --- a/include/tbb/machine/macos_common.h +++ b/include/tbb/machine/macos_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/mic_common.h b/include/tbb/machine/mic_common.h index aab7567..6edd66c 100644 --- a/include/tbb/machine/mic_common.h +++ b/include/tbb/machine/mic_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/msvc_armv7.h b/include/tbb/machine/msvc_armv7.h index d11da0a..402492a 100644 --- a/include/tbb/machine/msvc_armv7.h +++ b/include/tbb/machine/msvc_armv7.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/msvc_ia32_common.h b/include/tbb/machine/msvc_ia32_common.h index 613acaf..8a98571 100644 --- a/include/tbb/machine/msvc_ia32_common.h +++ b/include/tbb/machine/msvc_ia32_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/sunos_sparc.h b/include/tbb/machine/sunos_sparc.h index d0548ef..956499a 100644 --- a/include/tbb/machine/sunos_sparc.h +++ b/include/tbb/machine/sunos_sparc.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/windows_api.h b/include/tbb/machine/windows_api.h index b7fccb4..90c6156 100644 --- a/include/tbb/machine/windows_api.h +++ b/include/tbb/machine/windows_api.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/windows_ia32.h b/include/tbb/machine/windows_ia32.h index 169d14f..0b1e7dd 100644 --- a/include/tbb/machine/windows_ia32.h +++ b/include/tbb/machine/windows_ia32.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/machine/windows_intel64.h b/include/tbb/machine/windows_intel64.h index 2103c90..46365b6 100644 --- a/include/tbb/machine/windows_intel64.h +++ b/include/tbb/machine/windows_intel64.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/memory_pool.h b/include/tbb/memory_pool.h index 26c64c4..8c09e03 100644 --- a/include/tbb/memory_pool.h +++ b/include/tbb/memory_pool.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/mutex.h b/include/tbb/mutex.h index c499be3..67a2fd2 100644 --- a/include/tbb/mutex.h +++ b/include/tbb/mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/null_mutex.h b/include/tbb/null_mutex.h index 84cf658..11cb92d 100644 --- a/include/tbb/null_mutex.h +++ b/include/tbb/null_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/null_rw_mutex.h b/include/tbb/null_rw_mutex.h index c762b1c..b37da01 100644 --- a/include/tbb/null_rw_mutex.h +++ b/include/tbb/null_rw_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_do.h b/include/tbb/parallel_do.h index e5979f5..3e4b3ce 100644 --- a/include/tbb/parallel_do.h +++ b/include/tbb/parallel_do.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_for.h b/include/tbb/parallel_for.h index bfd8722..8b14976 100644 --- a/include/tbb/parallel_for.h +++ b/include/tbb/parallel_for.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_for_each.h b/include/tbb/parallel_for_each.h index d912fab..7e97024 100644 --- a/include/tbb/parallel_for_each.h +++ b/include/tbb/parallel_for_each.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_invoke.h b/include/tbb/parallel_invoke.h index 07fa6a7..e374904 100644 --- a/include/tbb/parallel_invoke.h +++ b/include/tbb/parallel_invoke.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_reduce.h b/include/tbb/parallel_reduce.h index 9429d19..c1c3ecb 100644 --- a/include/tbb/parallel_reduce.h +++ b/include/tbb/parallel_reduce.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_scan.h b/include/tbb/parallel_scan.h index 73da6f3..333e08e 100644 --- a/include/tbb/parallel_scan.h +++ b/include/tbb/parallel_scan.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_sort.h b/include/tbb/parallel_sort.h index 753bf3c..7f20c6f 100644 --- a/include/tbb/parallel_sort.h +++ b/include/tbb/parallel_sort.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/parallel_while.h b/include/tbb/parallel_while.h index be9f579..c954b93 100644 --- a/include/tbb/parallel_while.h +++ b/include/tbb/parallel_while.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/partitioner.h b/include/tbb/partitioner.h index fed7a8b..cb4469e 100644 --- a/include/tbb/partitioner.h +++ b/include/tbb/partitioner.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/pipeline.h b/include/tbb/pipeline.h index 5521da5..e67385a 100644 --- a/include/tbb/pipeline.h +++ b/include/tbb/pipeline.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/queuing_mutex.h b/include/tbb/queuing_mutex.h index 7092499..f3091bb 100644 --- a/include/tbb/queuing_mutex.h +++ b/include/tbb/queuing_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/queuing_rw_mutex.h b/include/tbb/queuing_rw_mutex.h index 9dd8444..17c79bb 100644 --- a/include/tbb/queuing_rw_mutex.h +++ b/include/tbb/queuing_rw_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/reader_writer_lock.h b/include/tbb/reader_writer_lock.h index f2546d5..232c1c8 100644 --- a/include/tbb/reader_writer_lock.h +++ b/include/tbb/reader_writer_lock.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/recursive_mutex.h b/include/tbb/recursive_mutex.h index ffebee5..11badb0 100644 --- a/include/tbb/recursive_mutex.h +++ b/include/tbb/recursive_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/runtime_loader.h b/include/tbb/runtime_loader.h index 9db7291..dd50ce6 100644 --- a/include/tbb/runtime_loader.h +++ b/include/tbb/runtime_loader.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/scalable_allocator.h b/include/tbb/scalable_allocator.h index 6656544..8e071e5 100644 --- a/include/tbb/scalable_allocator.h +++ b/include/tbb/scalable_allocator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -193,6 +193,7 @@ void *pool_aligned_realloc(MemoryPool* mPool, void *ptr, size_t size, size_t ali bool pool_reset(MemoryPool* memPool); bool pool_free(MemoryPool *memPool, void *object); MemoryPool *pool_identify(void *object); +size_t pool_msize(MemoryPool *memPool, void *object); } // namespace rml @@ -208,7 +209,11 @@ MemoryPool *pool_identify(void *object); #endif #if __TBB_ALLOCATOR_CONSTRUCT_VARIADIC - #include // std::forward +#include // std::forward +#endif + +#if __TBB_CPP17_MEMORY_RESOURCE_PRESENT +#include #endif namespace tbb { @@ -315,6 +320,48 @@ inline bool operator==( const scalable_allocator&, const scalable_allocator inline bool operator!=( const scalable_allocator&, const scalable_allocator& ) {return false;} +#if __TBB_CPP17_MEMORY_RESOURCE_PRESENT + +namespace internal { + +//! C++17 memory resource implementation for scalable allocator +//! ISO C++ Section 23.12.2 +class scalable_resource_impl : public std::pmr::memory_resource { +private: + void* do_allocate(size_t bytes, size_t alignment) override { + void* ptr = scalable_aligned_malloc( bytes, alignment ); + if (!ptr) { + throw_exception(std::bad_alloc()); + } + return ptr; + } + + void do_deallocate(void* ptr, size_t /*bytes*/, size_t /*alignment*/) override { + scalable_free(ptr); + } + + //! Memory allocated by one instance of scalable_resource_impl could be deallocated by any + //! other instance of this class + bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override { + return this == &other || +#if __TBB_USE_OPTIONAL_RTTI + dynamic_cast(&other) != NULL; +#else + false; +#endif + } +}; + +} // namespace internal + +//! Global scalable allocator memory resource provider +inline std::pmr::memory_resource* scalable_memory_resource() noexcept { + static tbb::internal::scalable_resource_impl scalable_res; + return &scalable_res; +} + +#endif /* __TBB_CPP17_MEMORY_RESOURCE_PRESENT */ + } // namespace tbb #if _MSC_VER diff --git a/include/tbb/spin_mutex.h b/include/tbb/spin_mutex.h index 76bbf89..2bd5c86 100644 --- a/include/tbb/spin_mutex.h +++ b/include/tbb/spin_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/spin_rw_mutex.h b/include/tbb/spin_rw_mutex.h index 835ca6c..a81e6a5 100644 --- a/include/tbb/spin_rw_mutex.h +++ b/include/tbb/spin_rw_mutex.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/task.h b/include/tbb/task.h index 1e7d84f..6b2fb57 100644 --- a/include/tbb/task.h +++ b/include/tbb/task.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -49,7 +49,9 @@ namespace internal { //< @cond INTERNAL task* self; task& parent; public: - explicit allocate_additional_child_of_proxy( task& parent_ ) : self(NULL), parent(parent_) {} + explicit allocate_additional_child_of_proxy( task& parent_ ) : self(NULL), parent(parent_) { + suppress_unused_warning( self ); + } task& __TBB_EXPORTED_METHOD allocate( size_t size ) const; void __TBB_EXPORTED_METHOD free( task& ) const; }; diff --git a/include/tbb/task_arena.h b/include/tbb/task_arena.h index fcdf6cd..f8e9b85 100644 --- a/include/tbb/task_arena.h +++ b/include/tbb/task_arena.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/task_group.h b/include/tbb/task_group.h index 42fd724..9874b4f 100644 --- a/include/tbb/task_group.h +++ b/include/tbb/task_group.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/task_scheduler_init.h b/include/tbb/task_scheduler_init.h index c559fd0..6f36330 100644 --- a/include/tbb/task_scheduler_init.h +++ b/include/tbb/task_scheduler_init.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/task_scheduler_observer.h b/include/tbb/task_scheduler_observer.h index a2020d7..c2a4476 100644 --- a/include/tbb/task_scheduler_observer.h +++ b/include/tbb/task_scheduler_observer.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbb.h b/include/tbb/tbb.h index 8908b86..39857db 100644 --- a/include/tbb/tbb.h +++ b/include/tbb/tbb.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -54,9 +54,7 @@ #include "critical_section.h" #include "enumerable_thread_specific.h" #include "flow_graph.h" -#if TBB_PREVIEW_GLOBAL_CONTROL #include "global_control.h" -#endif #include "iterators.h" #include "mutex.h" #include "null_mutex.h" diff --git a/include/tbb/tbb_allocator.h b/include/tbb/tbb_allocator.h index 162e4e3..3dc6c33 100644 --- a/include/tbb/tbb_allocator.h +++ b/include/tbb/tbb_allocator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbb_config.h b/include/tbb/tbb_config.h index 07affd7..bfb8938 100644 --- a/include/tbb/tbb_config.h +++ b/include/tbb/tbb_config.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -40,19 +40,22 @@ #include #endif -// note that when ICC or Clang is in use, __TBB_GCC_VERSION might not fully match +// Note that when ICC or Clang is in use, __TBB_GCC_VERSION might not fully match // the actual GCC version on the system. #define __TBB_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -// Since GNU libstdc++ does not have a convenient macro for its version, -// we rely on the version of GCC or the user-specified macro below. -// The format of TBB_USE_GLIBCXX_VERSION should match the __TBB_GCC_VERSION above, -// e.g. it should be set to 40902 for libstdc++ coming with GCC 4.9.2. +// Prior to GCC 7, GNU libstdc++ did not have a convenient version macro. +// Therefore we use different ways to detect its version. #ifdef TBB_USE_GLIBCXX_VERSION +// The version is explicitly specified in our public TBB_USE_GLIBCXX_VERSION macro. +// Its format should match the __TBB_GCC_VERSION above, e.g. 70301 for libstdc++ coming with GCC 7.3.1. #define __TBB_GLIBCXX_VERSION TBB_USE_GLIBCXX_VERSION +#elif _GLIBCXX_RELEASE && _GLIBCXX_RELEASE != __GNUC__ +// Reported versions of GCC and libstdc++ do not match; trust the latter +#define __TBB_GLIBCXX_VERSION (_GLIBCXX_RELEASE*10000) #elif __GLIBCPP__ || __GLIBCXX__ +// The version macro is not defined or matches the GCC version; use __TBB_GCC_VERSION #define __TBB_GLIBCXX_VERSION __TBB_GCC_VERSION -//TODO: analyze __GLIBCXX__ instead of __TBB_GCC_VERSION ? #endif #if __clang__ @@ -211,7 +214,8 @@ #define __TBB_ALIGNAS_PRESENT (__INTEL_CXX11_MODE__ && __INTEL_COMPILER >= 1500) #define __TBB_CPP11_TEMPLATE_ALIASES_PRESENT (__INTEL_CXX11_MODE__ && __INTEL_COMPILER >= 1210) #define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT (__cplusplus >= 201402L) - #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT __INTEL_COMPILER > 1900 + #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__cplusplus >= 201402L) + #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__INTEL_COMPILER > 1900) #define __TBB_CPP17_INVOKE_RESULT_PRESENT (__cplusplus >= 201703L) #elif __clang__ /** TODO: these options need to be rechecked **/ @@ -242,6 +246,7 @@ #define __TBB_ALIGNAS_PRESENT __has_feature(cxx_alignas) #define __TBB_CPP11_TEMPLATE_ALIASES_PRESENT __has_feature(cxx_alias_templates) #define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT (__cplusplus >= 201402L) + #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__has_feature(cxx_variable_templates)) #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__has_feature(__cpp_deduction_guides)) #define __TBB_CPP17_INVOKE_RESULT_PRESENT (__has_feature(__cpp_lib_is_invocable)) #elif __GNUC__ @@ -269,7 +274,8 @@ #define __TBB_ALIGNAS_PRESENT (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40800) #define __TBB_CPP11_TEMPLATE_ALIASES_PRESENT (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40700) #define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT (__cplusplus >= 201402L && __TBB_GCC_VERSION >= 50000) - #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__cpp_deduction_guides >= 201606) + #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__cplusplus >= 201402L && __TBB_GCC_VERSION >= 50000) + #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__cpp_deduction_guides >= 201606L) #define __TBB_CPP17_INVOKE_RESULT_PRESENT (__cplusplus >= 201703L && __TBB_GCC_VERSION >= 70000) #elif _MSC_VER // These definitions are also used with Intel C++ Compiler in "default" mode (__INTEL_CXX11_MODE__ == 0); @@ -295,8 +301,10 @@ #define __TBB_ALIGNAS_PRESENT (_MSC_VER >= 1900) #define __TBB_CPP11_TEMPLATE_ALIASES_PRESENT (_MSC_VER >= 1800) #define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT (_MSC_VER >= 1900) - #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (_MSVC_LANG >= 201703L) - #define __TBB_CPP17_INVOKE_RESULT_PRESENT (__TBB_MSVC_CPP_VER >= 201703L && _MSC_VER >= 1914) + /* Variable templates are supported in VS2015 Update 2 or later */ + #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (_MSC_FULL_VER >= 190023918 && (!__INTEL_COMPILER || __INTEL_COMPILER >= 1700)) + #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (_MSVC_LANG >= 201703L && _MSC_VER >= 1914) + #define __TBB_CPP17_INVOKE_RESULT_PRESENT (_MSVC_LANG >= 201703L && _MSC_VER >= 1911) #else #define __TBB_CPP11_VARIADIC_TEMPLATES_PRESENT 0 #define __TBB_CPP11_RVALUE_REF_PRESENT 0 @@ -317,6 +325,7 @@ #define __TBB_ALIGNAS_PRESENT 0 #define __TBB_CPP11_TEMPLATE_ALIASES_PRESENT 0 #define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT (__cplusplus >= 201402L) + #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT 0 #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT 0 #define __TBB_CPP17_INVOKE_RESULT_PRESENT 0 #endif @@ -337,7 +346,7 @@ // In GCC, std::move_if_noexcept appeared later than noexcept #define __TBB_MOVE_IF_NOEXCEPT_PRESENT (__TBB_NOEXCEPT_PRESENT && (__TBB_GLIBCXX_VERSION >= 40700 || _MSC_VER >= 1900 || _LIBCPP_VERSION)) -#define __TBB_ALLOCATOR_TRAITS_PRESENT (__cplusplus >= 201103L && _LIBCPP_VERSION || _MSC_VER >= 1700 || \ +#define __TBB_ALLOCATOR_TRAITS_PRESENT (__cplusplus >= 201103L && _LIBCPP_VERSION || _MSC_VER >= 1800 || \ __GXX_EXPERIMENTAL_CXX0X__ && __TBB_GLIBCXX_VERSION >= 40700 && !(__TBB_GLIBCXX_VERSION == 40700 && __TBB_DEFINE_MIC)) #define __TBB_MAKE_EXCEPTION_PTR_PRESENT (__TBB_EXCEPTION_PTR_PRESENT && (_MSC_VER >= 1700 || __TBB_GLIBCXX_VERSION >= 40600 || _LIBCPP_VERSION)) @@ -352,7 +361,11 @@ #define __TBB_CPP17_UNCAUGHT_EXCEPTIONS_PRESENT (_MSC_VER >= 1900 || __GLIBCXX__ && __cpp_lib_uncaught_exceptions \ || _LIBCPP_VERSION >= 3700 && (!__TBB_MACOS_TARGET_VERSION || __TBB_MACOS_TARGET_VERSION >= 101200)) - +// TODO: wait when memory_resource will be fully supported in clang and define the right macro +// Currently it is in experimental stage since 6 version. +#define __TBB_CPP17_MEMORY_RESOURCE_PRESENT (_MSC_VER >= 1913 && (_MSVC_LANG > 201402L || __cplusplus > 201402L) || \ + __GLIBCXX__ && __cpp_lib_memory_resource >= 201603) +#define __TBB_CPP17_HW_INTERFERENCE_SIZE_PRESENT (_MSC_VER >= 1911) // std::swap is in only since C++11, though MSVC had it at least since VS2005 #if _MSC_VER>=1400 || _LIBCPP_VERSION || __GXX_EXPERIMENTAL_CXX0X__ #define __TBB_STD_SWAP_HEADER diff --git a/include/tbb/tbb_disable_exceptions.h b/include/tbb/tbb_disable_exceptions.h index be1bb11..2fe4663 100644 --- a/include/tbb/tbb_disable_exceptions.h +++ b/include/tbb/tbb_disable_exceptions.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbb_exception.h b/include/tbb/tbb_exception.h index af0ec6d..f5d571b 100644 --- a/include/tbb/tbb_exception.h +++ b/include/tbb/tbb_exception.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbb_machine.h b/include/tbb/tbb_machine.h index e79d82e..9724202 100644 --- a/include/tbb/tbb_machine.h +++ b/include/tbb/tbb_machine.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbb_profiling.h b/include/tbb/tbb_profiling.h index bc22a83..2f212fd 100644 --- a/include/tbb/tbb_profiling.h +++ b/include/tbb/tbb_profiling.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbb_stddef.h b/include/tbb/tbb_stddef.h index 83803ce..07534ba 100644 --- a/include/tbb/tbb_stddef.h +++ b/include/tbb/tbb_stddef.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 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 @@ #define TBB_VERSION_MINOR 0 // Engineering-focused interface version -#define TBB_INTERFACE_VERSION 11003 +#define TBB_INTERFACE_VERSION 11004 #define TBB_INTERFACE_VERSION_MAJOR TBB_INTERFACE_VERSION/1000 // The oldest major interface version still supported @@ -431,8 +431,8 @@ private: // Following is a set of classes and functions typically used in compile-time "metaprogramming". // TODO: move all that to a separate header -#if __TBB_ALLOCATOR_TRAITS_PRESENT || __TBB_CPP11_SMART_POINTERS_PRESENT -#include // for allocator_traits, unique_ptr +#if __TBB_CPP11_SMART_POINTERS_PRESENT +#include // for unique_ptr #endif #if __TBB_CPP11_RVALUE_REF_PRESENT || __TBB_CPP11_DECLTYPE_PRESENT || _LIBCPP_VERSION @@ -472,15 +472,6 @@ struct bool_constant { typedef bool_constant true_type; typedef bool_constant false_type; -#if __TBB_ALLOCATOR_TRAITS_PRESENT -using std::allocator_traits; -#else -template -struct allocator_traits{ - typedef tbb::internal::false_type propagate_on_container_move_assignment; -}; -#endif - //! A template to select either 32-bit or 64-bit constant as compile time, depending on machine word size. template struct select_size_t_constant { diff --git a/include/tbb/tbb_thread.h b/include/tbb/tbb_thread.h index 75d18b9..04e8a96 100644 --- a/include/tbb/tbb_thread.h +++ b/include/tbb/tbb_thread.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/include/tbb/tbbmalloc_proxy.h b/include/tbb/tbbmalloc_proxy.h index 66a8f9e..7e4b53f 100644 --- a/include/tbb/tbbmalloc_proxy.h +++ b/include/tbb/tbbmalloc_proxy.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -63,4 +63,7 @@ struct __TBB_malloc_proxy_caller { #endif // _MSC_VER +/* Public Windows API */ +extern "C" int TBB_malloc_replacement_log(char *** function_replacement_log_ptr); + #endif //__TBB_tbbmalloc_proxy_H diff --git a/include/tbb/tick_count.h b/include/tbb/tick_count.h index de49f9e..28a0b1d 100644 --- a/include/tbb/tick_count.h +++ b/include/tbb/tick_count.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/index.html b/index.html index 46e2103..f18a1a9 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@ To port Intel TBB to a new platform, operating system or architecture, see the <

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/jni/Android.mk b/jni/Android.mk index 01bdd88..9078195 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/jni/Application.mk b/jni/Application.mk index 6ffa191..cf3241e 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/Makefile b/python/Makefile index e92cb44..e58412a 100644 --- a/python/Makefile +++ b/python/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/TBB.py b/python/TBB.py index 7a6ff8e..2cafdf3 100644 --- a/python/TBB.py +++ b/python/TBB.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/index.html b/python/index.html index e9d3096..a475388 100644 --- a/python/index.html +++ b/python/index.html @@ -74,7 +74,7 @@ Red Hat* Enterprise Linux* 7.
Up to parent directory

-Copyright © 2016-2018 Intel Corporation. All Rights Reserved. +Copyright © 2016-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/python/rml/Makefile b/python/rml/Makefile index ef55ad9..5504d24 100644 --- a/python/rml/Makefile +++ b/python/rml/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018 Intel Corporation +# Copyright (c) 2017-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/rml/ipc_server.cpp b/python/rml/ipc_server.cpp index 3d72fa7..6249ac0 100644 --- a/python/rml/ipc_server.cpp +++ b/python/rml/ipc_server.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Intel Corporation + Copyright (c) 2017-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/python/rml/ipc_utils.cpp b/python/rml/ipc_utils.cpp index d21325c..de6afe4 100644 --- a/python/rml/ipc_utils.cpp +++ b/python/rml/ipc_utils.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Intel Corporation + Copyright (c) 2017-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/python/rml/ipc_utils.h b/python/rml/ipc_utils.h index 82f128e..5e6b336 100644 --- a/python/rml/ipc_utils.h +++ b/python/rml/ipc_utils.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Intel Corporation + Copyright (c) 2017-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/python/setup.py b/python/setup.py index bb6c2e2..e281028 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/tbb/__init__.py b/python/tbb/__init__.py index 1e1d7d5..6eddad5 100644 --- a/python/tbb/__init__.py +++ b/python/tbb/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/tbb/__main__.py b/python/tbb/__main__.py index 2c125c1..506430f 100644 --- a/python/tbb/__main__.py +++ b/python/tbb/__main__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/tbb/api.i b/python/tbb/api.i index 88e3d87..a923be7 100644 --- a/python/tbb/api.i +++ b/python/tbb/api.i @@ -1,6 +1,6 @@ %pythonbegin %{ # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ __all__ = ["task_arena", "task_group", "task_scheduler_init", "global_control", #endif %{ -#define TBB_PREVIEW_GLOBAL_CONTROL 1 #define TBB_PREVIEW_WAITING_FOR_WORKERS 1 #include #include diff --git a/python/tbb/pool.py b/python/tbb/pool.py index 360ec53..0ebdff7 100644 --- a/python/tbb/pool.py +++ b/python/tbb/pool.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/python/tbb/test.py b/python/tbb/test.py index 7b78faa..04dbffb 100644 --- a/python/tbb/test.py +++ b/python/tbb/test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/Makefile b/src/Makefile index 17cedc6..a4b685c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/index.html b/src/index.html index 11cefe9..43d7e83 100644 --- a/src/index.html +++ b/src/index.html @@ -66,7 +66,7 @@ This directory contains the source code and unit tests for Intel® Threading
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/old/concurrent_queue_v2.cpp b/src/old/concurrent_queue_v2.cpp index 4f6cf1f..e1443e7 100644 --- a/src/old/concurrent_queue_v2.cpp +++ b/src/old/concurrent_queue_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/concurrent_queue_v2.h b/src/old/concurrent_queue_v2.h index f6165bf..5bc7bb0 100644 --- a/src/old/concurrent_queue_v2.h +++ b/src/old/concurrent_queue_v2.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/concurrent_vector_v2.cpp b/src/old/concurrent_vector_v2.cpp index edc64b1..1a67c8f 100644 --- a/src/old/concurrent_vector_v2.cpp +++ b/src/old/concurrent_vector_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/concurrent_vector_v2.h b/src/old/concurrent_vector_v2.h index c176699..f398cd2 100644 --- a/src/old/concurrent_vector_v2.h +++ b/src/old/concurrent_vector_v2.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/spin_rw_mutex_v2.cpp b/src/old/spin_rw_mutex_v2.cpp index 2f72013..c87a811 100644 --- a/src/old/spin_rw_mutex_v2.cpp +++ b/src/old/spin_rw_mutex_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/spin_rw_mutex_v2.h b/src/old/spin_rw_mutex_v2.h index 27a55d1..6fb5e13 100644 --- a/src/old/spin_rw_mutex_v2.h +++ b/src/old/spin_rw_mutex_v2.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/task_v2.cpp b/src/old/task_v2.cpp index 6607e7e..ae9a7e0 100644 --- a/src/old/task_v2.cpp +++ b/src/old/task_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/test_concurrent_queue_v2.cpp b/src/old/test_concurrent_queue_v2.cpp index 666eb45..132713b 100644 --- a/src/old/test_concurrent_queue_v2.cpp +++ b/src/old/test_concurrent_queue_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/test_concurrent_vector_v2.cpp b/src/old/test_concurrent_vector_v2.cpp index a575048..b0bdb58 100644 --- a/src/old/test_concurrent_vector_v2.cpp +++ b/src/old/test_concurrent_vector_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/test_mutex_v2.cpp b/src/old/test_mutex_v2.cpp index 90c94da..4c29e25 100644 --- a/src/old/test_mutex_v2.cpp +++ b/src/old/test_mutex_v2.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/old/test_task_scheduler_observer_v3.cpp b/src/old/test_task_scheduler_observer_v3.cpp index b569130..a23f17f 100644 --- a/src/old/test_task_scheduler_observer_v3.cpp +++ b/src/old/test_task_scheduler_observer_v3.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/coarse_grained_raii_lru_cache.h b/src/perf/coarse_grained_raii_lru_cache.h index 76e0d3e..c55f2d5 100644 --- a/src/perf/coarse_grained_raii_lru_cache.h +++ b/src/perf/coarse_grained_raii_lru_cache.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/cpq_pdes.cpp b/src/perf/cpq_pdes.cpp index 6acf0f7..dc64e32 100644 --- a/src/perf/cpq_pdes.cpp +++ b/src/perf/cpq_pdes.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/fibonacci_impl_tbb.cpp b/src/perf/fibonacci_impl_tbb.cpp index 168883a..7b4b393 100644 --- a/src/perf/fibonacci_impl_tbb.cpp +++ b/src/perf/fibonacci_impl_tbb.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/perf.cpp b/src/perf/perf.cpp index d9910cc..4f94ddd 100644 --- a/src/perf/perf.cpp +++ b/src/perf/perf.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/perf.h b/src/perf/perf.h index dea3283..5988593 100644 --- a/src/perf/perf.h +++ b/src/perf/perf.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/perf_sched.cpp b/src/perf/perf_sched.cpp index 97b92ef..be00016 100644 --- a/src/perf/perf_sched.cpp +++ b/src/perf/perf_sched.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/run_statistics.sh b/src/perf/run_statistics.sh index f3e2020..47d68c9 100644 --- a/src/perf/run_statistics.sh +++ b/src/perf/run_statistics.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2005-2018 Intel Corporation +# Copyright (c) 2005-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/perf/statistics.cpp b/src/perf/statistics.cpp index 8b660c2..579f3de 100644 --- a/src/perf/statistics.cpp +++ b/src/perf/statistics.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/statistics.h b/src/perf/statistics.h index c60aa37..3dec443 100644 --- a/src/perf/statistics.h +++ b/src/perf/statistics.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/statistics_xml.h b/src/perf/statistics_xml.h index 48a3d7e..126958f 100644 --- a/src/perf/statistics_xml.h +++ b/src/perf/statistics_xml.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_async_return.cpp b/src/perf/time_async_return.cpp index a4c9b94..36c5d14 100644 --- a/src/perf/time_async_return.cpp +++ b/src/perf/time_async_return.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_cpq_throughput_test.cpp b/src/perf/time_cpq_throughput_test.cpp index 4056330..c98361c 100644 --- a/src/perf/time_cpq_throughput_test.cpp +++ b/src/perf/time_cpq_throughput_test.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_fibonacci_cutoff.cpp b/src/perf/time_fibonacci_cutoff.cpp index e22f2ac..7c8c33b 100644 --- a/src/perf/time_fibonacci_cutoff.cpp +++ b/src/perf/time_fibonacci_cutoff.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_framework.h b/src/perf/time_framework.h index 9f1ca2e..7a37cda 100644 --- a/src/perf/time_framework.h +++ b/src/perf/time_framework.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_hash_map.cpp b/src/perf/time_hash_map.cpp index 17dcd28..1d452df 100644 --- a/src/perf/time_hash_map.cpp +++ b/src/perf/time_hash_map.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_hash_map_fill.cpp b/src/perf/time_hash_map_fill.cpp index 353a854..0846329 100644 --- a/src/perf/time_hash_map_fill.cpp +++ b/src/perf/time_hash_map_fill.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_hash_map_fill.html b/src/perf/time_hash_map_fill.html index 379df27..f5b43e6 100644 --- a/src/perf/time_hash_map_fill.html +++ b/src/perf/time_hash_map_fill.html @@ -112,7 +112,7 @@ In addition, a size of the source array correlates with input rates in order to
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/perf/time_locked_work.cpp b/src/perf/time_locked_work.cpp index 7ed9894..b7b9d63 100644 --- a/src/perf/time_locked_work.cpp +++ b/src/perf/time_locked_work.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_lru_cache_throughput.cpp b/src/perf/time_lru_cache_throughput.cpp index cec2e33..7bf468a 100644 --- a/src/perf/time_lru_cache_throughput.cpp +++ b/src/perf/time_lru_cache_throughput.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_parallel_for_each.cpp b/src/perf/time_parallel_for_each.cpp index d34199f..e88a7b8 100644 --- a/src/perf/time_parallel_for_each.cpp +++ b/src/perf/time_parallel_for_each.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_sandbox.h b/src/perf/time_sandbox.h index 67e4c01..f882109 100644 --- a/src/perf/time_sandbox.h +++ b/src/perf/time_sandbox.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_split_node.cpp b/src/perf/time_split_node.cpp index 8771a77..a973103 100644 --- a/src/perf/time_split_node.cpp +++ b/src/perf/time_split_node.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/perf/time_vector.cpp b/src/perf/time_vector.cpp index 93e2e35..8329f6a 100644 --- a/src/perf/time_vector.cpp +++ b/src/perf/time_vector.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/client/index.html b/src/rml/client/index.html index 0a652b7..8e7b50e 100644 --- a/src/rml/client/index.html +++ b/src/rml/client/index.html @@ -31,7 +31,7 @@ This directory has source code that must be statically linked into an RML client
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/rml/client/library_assert.h b/src/rml/client/library_assert.h index 0af2d5c..f7d591a 100644 --- a/src/rml/client/library_assert.h +++ b/src/rml/client/library_assert.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/client/omp_dynamic_link.cpp b/src/rml/client/omp_dynamic_link.cpp index 2da09a3..ce72ea0 100644 --- a/src/rml/client/omp_dynamic_link.cpp +++ b/src/rml/client/omp_dynamic_link.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/client/omp_dynamic_link.h b/src/rml/client/omp_dynamic_link.h index 331e2ca..b4d6871 100644 --- a/src/rml/client/omp_dynamic_link.h +++ b/src/rml/client/omp_dynamic_link.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/client/rml_factory.h b/src/rml/client/rml_factory.h index 500870d..bf9c3d3 100644 --- a/src/rml/client/rml_factory.h +++ b/src/rml/client/rml_factory.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/client/rml_omp.cpp b/src/rml/client/rml_omp.cpp index e1991c1..d80ffbd 100644 --- a/src/rml/client/rml_omp.cpp +++ b/src/rml/client/rml_omp.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/client/rml_tbb.cpp b/src/rml/client/rml_tbb.cpp index 9978197..83641cb 100644 --- a/src/rml/client/rml_tbb.cpp +++ b/src/rml/client/rml_tbb.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/include/index.html b/src/rml/include/index.html index 5c080a2..5e21841 100644 --- a/src/rml/include/index.html +++ b/src/rml/include/index.html @@ -18,7 +18,7 @@ This directory has the include files for the Resource Management Layer (RML).
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/rml/include/rml_base.h b/src/rml/include/rml_base.h index f60ed7e..a89a0d8 100644 --- a/src/rml/include/rml_base.h +++ b/src/rml/include/rml_base.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/include/rml_omp.h b/src/rml/include/rml_omp.h index e97ebb6..7a28210 100644 --- a/src/rml/include/rml_omp.h +++ b/src/rml/include/rml_omp.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/include/rml_tbb.h b/src/rml/include/rml_tbb.h index 3526052..a1207b8 100644 --- a/src/rml/include/rml_tbb.h +++ b/src/rml/include/rml_tbb.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/index.html b/src/rml/index.html index afd48f2..49099bf 100644 --- a/src/rml/index.html +++ b/src/rml/index.html @@ -20,7 +20,7 @@ The subdirectories pertain to the Resource Management Layer (RML).
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/rml/perfor/omp_nested.cpp b/src/rml/perfor/omp_nested.cpp index 3a21b04..d2954d0 100644 --- a/src/rml/perfor/omp_nested.cpp +++ b/src/rml/perfor/omp_nested.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/perfor/omp_simple.cpp b/src/rml/perfor/omp_simple.cpp index 2460421..c5f9a82 100644 --- a/src/rml/perfor/omp_simple.cpp +++ b/src/rml/perfor/omp_simple.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/perfor/tbb_multi_omp.cpp b/src/rml/perfor/tbb_multi_omp.cpp index 5b5064c..82fd34b 100644 --- a/src/rml/perfor/tbb_multi_omp.cpp +++ b/src/rml/perfor/tbb_multi_omp.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/perfor/tbb_simple.cpp b/src/rml/perfor/tbb_simple.cpp index 58558ba..5da76d7 100644 --- a/src/rml/perfor/tbb_simple.cpp +++ b/src/rml/perfor/tbb_simple.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/perfor/thread_level.h b/src/rml/perfor/thread_level.h index abc1f53..db0a49c 100644 --- a/src/rml/perfor/thread_level.h +++ b/src/rml/perfor/thread_level.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/server/index.html b/src/rml/server/index.html index df6b093..75edbe9 100644 --- a/src/rml/server/index.html +++ b/src/rml/server/index.html @@ -7,7 +7,7 @@ This directory has source code internal to the server.
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/rml/server/irml.rc b/src/rml/server/irml.rc index b06cebb..27d32b1 100644 --- a/src/rml/server/irml.rc +++ b/src/rml/server/irml.rc @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ BEGIN VALUE "CompanyName", "Intel Corporation\0" VALUE "FileDescription", "Intel(R) Threading Building Blocks resource manager library\0" VALUE "FileVersion", TBB_VERSION "\0" - VALUE "LegalCopyright", "Copyright 2005-2018 Intel Corporation. All Rights Reserved.\0" + VALUE "LegalCopyright", "Copyright 2005-2019 Intel Corporation. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" #ifndef TBB_USE_DEBUG VALUE "OriginalFilename", "irml.dll\0" diff --git a/src/rml/server/job_automaton.h b/src/rml/server/job_automaton.h index 370bead..b9d1f51 100644 --- a/src/rml/server/job_automaton.h +++ b/src/rml/server/job_automaton.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/server/lin-rml-export.def b/src/rml/server/lin-rml-export.def index 04f43bb..923cf65 100644 --- a/src/rml/server/lin-rml-export.def +++ b/src/rml/server/lin-rml-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/server/rml_server.cpp b/src/rml/server/rml_server.cpp index 2508465..2d30c11 100644 --- a/src/rml/server/rml_server.cpp +++ b/src/rml/server/rml_server.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/server/thread_monitor.h b/src/rml/server/thread_monitor.h index 2b59bb7..25e77a1 100644 --- a/src/rml/server/thread_monitor.h +++ b/src/rml/server/thread_monitor.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/server/wait_counter.h b/src/rml/server/wait_counter.h index 2fcad92..163bb96 100644 --- a/src/rml/server/wait_counter.h +++ b/src/rml/server/wait_counter.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/server/win32-rml-export.def b/src/rml/server/win32-rml-export.def index bf379d1..0c6fd39 100644 --- a/src/rml/server/win32-rml-export.def +++ b/src/rml/server/win32-rml-export.def @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/rml/server/win64-rml-export.def b/src/rml/server/win64-rml-export.def index bf379d1..0c6fd39 100644 --- a/src/rml/server/win64-rml-export.def +++ b/src/rml/server/win64-rml-export.def @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/rml/test/rml_omp_stub.cpp b/src/rml/test/rml_omp_stub.cpp index b682b6e..4310de4 100644 --- a/src/rml/test/rml_omp_stub.cpp +++ b/src/rml/test/rml_omp_stub.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_job_automaton.cpp b/src/rml/test/test_job_automaton.cpp index 3499c9b..e80cbb4 100644 --- a/src/rml/test/test_job_automaton.cpp +++ b/src/rml/test/test_job_automaton.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_rml_mixed.cpp b/src/rml/test/test_rml_mixed.cpp index 37b75ff..f5e2dd0 100644 --- a/src/rml/test/test_rml_mixed.cpp +++ b/src/rml/test/test_rml_mixed.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_rml_omp.cpp b/src/rml/test/test_rml_omp.cpp index 037ec6b..d8f22a4 100644 --- a/src/rml/test/test_rml_omp.cpp +++ b/src/rml/test/test_rml_omp.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_rml_omp_c_linkage.c b/src/rml/test/test_rml_omp_c_linkage.c index 50b9e23..c9e7248 100644 --- a/src/rml/test/test_rml_omp_c_linkage.c +++ b/src/rml/test/test_rml_omp_c_linkage.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_rml_tbb.cpp b/src/rml/test/test_rml_tbb.cpp index 6e78d4a..6e63c33 100644 --- a/src/rml/test/test_rml_tbb.cpp +++ b/src/rml/test/test_rml_tbb.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_server.h b/src/rml/test/test_server.h index 0e77b96..3d9e5a2 100644 --- a/src/rml/test/test_server.h +++ b/src/rml/test/test_server.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/rml/test/test_thread_monitor.cpp b/src/rml/test/test_thread_monitor.cpp index e92e886..2151d73 100644 --- a/src/rml/test/test_thread_monitor.cpp +++ b/src/rml/test/test_thread_monitor.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/arena.cpp b/src/tbb/arena.cpp index 7761802..40e4945 100644 --- a/src/tbb/arena.cpp +++ b/src/tbb/arena.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/arena.h b/src/tbb/arena.h index 7e90205..d99afdb 100644 --- a/src/tbb/arena.h +++ b/src/tbb/arena.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/cache_aligned_allocator.cpp b/src/tbb/cache_aligned_allocator.cpp index 6525308..b651975 100644 --- a/src/tbb/cache_aligned_allocator.cpp +++ b/src/tbb/cache_aligned_allocator.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/cilk-tbb-interop.h b/src/tbb/cilk-tbb-interop.h index 4549677..85dc06a 100644 --- a/src/tbb/cilk-tbb-interop.h +++ b/src/tbb/cilk-tbb-interop.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/concurrent_hash_map.cpp b/src/tbb/concurrent_hash_map.cpp index e6c2da4..7104424 100644 --- a/src/tbb/concurrent_hash_map.cpp +++ b/src/tbb/concurrent_hash_map.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/concurrent_monitor.cpp b/src/tbb/concurrent_monitor.cpp index e8501b0..2cb9b3e 100644 --- a/src/tbb/concurrent_monitor.cpp +++ b/src/tbb/concurrent_monitor.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/concurrent_monitor.h b/src/tbb/concurrent_monitor.h index 1efa52e..26aa2dc 100644 --- a/src/tbb/concurrent_monitor.h +++ b/src/tbb/concurrent_monitor.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/concurrent_queue.cpp b/src/tbb/concurrent_queue.cpp index 5401e23..de61ff3 100644 --- a/src/tbb/concurrent_queue.cpp +++ b/src/tbb/concurrent_queue.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/concurrent_vector.cpp b/src/tbb/concurrent_vector.cpp index d9a2596..70653a9 100644 --- a/src/tbb/concurrent_vector.cpp +++ b/src/tbb/concurrent_vector.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/condition_variable.cpp b/src/tbb/condition_variable.cpp index 7c21314..b7b8caf 100644 --- a/src/tbb/condition_variable.cpp +++ b/src/tbb/condition_variable.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/critical_section.cpp b/src/tbb/critical_section.cpp index 841b8d8..8436c21 100644 --- a/src/tbb/critical_section.cpp +++ b/src/tbb/critical_section.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/custom_scheduler.h b/src/tbb/custom_scheduler.h index 3c7ab7e..791c105 100644 --- a/src/tbb/custom_scheduler.h +++ b/src/tbb/custom_scheduler.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp index ed046f3..b09136c 100644 --- a/src/tbb/dynamic_link.cpp +++ b/src/tbb/dynamic_link.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/dynamic_link.h b/src/tbb/dynamic_link.h index 337f82b..958cc48 100644 --- a/src/tbb/dynamic_link.h +++ b/src/tbb/dynamic_link.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/governor.cpp b/src/tbb/governor.cpp index 9fabe6e..d6c31e3 100644 --- a/src/tbb/governor.cpp +++ b/src/tbb/governor.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/governor.h b/src/tbb/governor.h index 1f4949c..ad871a2 100644 --- a/src/tbb/governor.h +++ b/src/tbb/governor.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/ia32-masm/atomic_support.asm b/src/tbb/ia32-masm/atomic_support.asm index 059b547..75395fc 100644 --- a/src/tbb/ia32-masm/atomic_support.asm +++ b/src/tbb/ia32-masm/atomic_support.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/ia32-masm/itsx.asm b/src/tbb/ia32-masm/itsx.asm index e10248f..b6a0f72 100644 --- a/src/tbb/ia32-masm/itsx.asm +++ b/src/tbb/ia32-masm/itsx.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/ia32-masm/lock_byte.asm b/src/tbb/ia32-masm/lock_byte.asm index c0f9ebd..bd1643e 100644 --- a/src/tbb/ia32-masm/lock_byte.asm +++ b/src/tbb/ia32-masm/lock_byte.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/ia64-gas/atomic_support.s b/src/tbb/ia64-gas/atomic_support.s index bd60d98..2dc84af 100644 --- a/src/tbb/ia64-gas/atomic_support.s +++ b/src/tbb/ia64-gas/atomic_support.s @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/tbb/ia64-gas/ia64_misc.s b/src/tbb/ia64-gas/ia64_misc.s index 1f28281..b189ae9 100644 --- a/src/tbb/ia64-gas/ia64_misc.s +++ b/src/tbb/ia64-gas/ia64_misc.s @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/tbb/ia64-gas/lock_byte.s b/src/tbb/ia64-gas/lock_byte.s index 5a90b07..cc63a87 100644 --- a/src/tbb/ia64-gas/lock_byte.s +++ b/src/tbb/ia64-gas/lock_byte.s @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/tbb/ia64-gas/log2.s b/src/tbb/ia64-gas/log2.s index 7101098..53d16f8 100644 --- a/src/tbb/ia64-gas/log2.s +++ b/src/tbb/ia64-gas/log2.s @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/tbb/ia64-gas/pause.s b/src/tbb/ia64-gas/pause.s index efcf0db..9f78d0d 100644 --- a/src/tbb/ia64-gas/pause.s +++ b/src/tbb/ia64-gas/pause.s @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/tbb/ibm_aix51/atomic_support.c b/src/tbb/ibm_aix51/atomic_support.c index 174f183..1985cde 100644 --- a/src/tbb/ibm_aix51/atomic_support.c +++ b/src/tbb/ibm_aix51/atomic_support.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/index.html b/src/tbb/index.html index 902443f..f9cea0f 100644 --- a/src/tbb/index.html +++ b/src/tbb/index.html @@ -21,7 +21,7 @@ This directory contains the source code of the TBB core components.
Up to parent directory

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/tbb/intel64-masm/atomic_support.asm b/src/tbb/intel64-masm/atomic_support.asm index 871f9d1..4925b6e 100644 --- a/src/tbb/intel64-masm/atomic_support.asm +++ b/src/tbb/intel64-masm/atomic_support.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/intel64-masm/intel64_misc.asm b/src/tbb/intel64-masm/intel64_misc.asm index 0c83500..934be99 100644 --- a/src/tbb/intel64-masm/intel64_misc.asm +++ b/src/tbb/intel64-masm/intel64_misc.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/intel64-masm/itsx.asm b/src/tbb/intel64-masm/itsx.asm index be7be74..fb69b73 100644 --- a/src/tbb/intel64-masm/itsx.asm +++ b/src/tbb/intel64-masm/itsx.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/intrusive_list.h b/src/tbb/intrusive_list.h index bf16b1d..d7726e6 100644 --- a/src/tbb/intrusive_list.h +++ b/src/tbb/intrusive_list.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/itt_notify.cpp b/src/tbb/itt_notify.cpp index 31c5559..4286491 100644 --- a/src/tbb/itt_notify.cpp +++ b/src/tbb/itt_notify.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/itt_notify.h b/src/tbb/itt_notify.h index 32d5d9d..3e322b5 100644 --- a/src/tbb/itt_notify.h +++ b/src/tbb/itt_notify.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/lin32-tbb-export.def b/src/tbb/lin32-tbb-export.def index 8f44f31..9c6e83e 100644 --- a/src/tbb/lin32-tbb-export.def +++ b/src/tbb/lin32-tbb-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/lin32-tbb-export.lst b/src/tbb/lin32-tbb-export.lst index 6fb1626..839f399 100644 --- a/src/tbb/lin32-tbb-export.lst +++ b/src/tbb/lin32-tbb-export.lst @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/lin64-tbb-export.def b/src/tbb/lin64-tbb-export.def index 4f1a07b..fa7b148 100644 --- a/src/tbb/lin64-tbb-export.def +++ b/src/tbb/lin64-tbb-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/lin64-tbb-export.lst b/src/tbb/lin64-tbb-export.lst index 1e6eaed..edc4afd 100644 --- a/src/tbb/lin64-tbb-export.lst +++ b/src/tbb/lin64-tbb-export.lst @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/lin64ipf-tbb-export.def b/src/tbb/lin64ipf-tbb-export.def index e567e22..5235cca 100644 --- a/src/tbb/lin64ipf-tbb-export.def +++ b/src/tbb/lin64ipf-tbb-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/lin64ipf-tbb-export.lst b/src/tbb/lin64ipf-tbb-export.lst index 369f178..0ac7e5a 100644 --- a/src/tbb/lin64ipf-tbb-export.lst +++ b/src/tbb/lin64ipf-tbb-export.lst @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/mac32-tbb-export.def b/src/tbb/mac32-tbb-export.def index a465b0c..c16fa46 100644 --- a/src/tbb/mac32-tbb-export.def +++ b/src/tbb/mac32-tbb-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/mac32-tbb-export.lst b/src/tbb/mac32-tbb-export.lst index 0261a6c..ea853a9 100644 --- a/src/tbb/mac32-tbb-export.lst +++ b/src/tbb/mac32-tbb-export.lst @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/mac64-tbb-export.def b/src/tbb/mac64-tbb-export.def index 07dc4b8..3765846 100644 --- a/src/tbb/mac64-tbb-export.def +++ b/src/tbb/mac64-tbb-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/mac64-tbb-export.lst b/src/tbb/mac64-tbb-export.lst index 2024cd4..9eeae6f 100644 --- a/src/tbb/mac64-tbb-export.lst +++ b/src/tbb/mac64-tbb-export.lst @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/mailbox.h b/src/tbb/mailbox.h index 75a216e..3b3b060 100644 --- a/src/tbb/mailbox.h +++ b/src/tbb/mailbox.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/market.cpp b/src/tbb/market.cpp index c922609..ec1cff9 100644 --- a/src/tbb/market.cpp +++ b/src/tbb/market.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/market.h b/src/tbb/market.h index d6bdf10..bc3874f 100644 --- a/src/tbb/market.h +++ b/src/tbb/market.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/mutex.cpp b/src/tbb/mutex.cpp index 12a4490..b17f0c4 100644 --- a/src/tbb/mutex.cpp +++ b/src/tbb/mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/observer_proxy.cpp b/src/tbb/observer_proxy.cpp index 1a5b39a..f0c442d 100644 --- a/src/tbb/observer_proxy.cpp +++ b/src/tbb/observer_proxy.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/observer_proxy.h b/src/tbb/observer_proxy.h index 9751293..5f853ea 100644 --- a/src/tbb/observer_proxy.h +++ b/src/tbb/observer_proxy.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/pipeline.cpp b/src/tbb/pipeline.cpp index a23d147..71a1677 100644 --- a/src/tbb/pipeline.cpp +++ b/src/tbb/pipeline.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/private_server.cpp b/src/tbb/private_server.cpp index bd79453..c08e025 100644 --- a/src/tbb/private_server.cpp +++ b/src/tbb/private_server.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/queuing_mutex.cpp b/src/tbb/queuing_mutex.cpp index fdbb218..4083c10 100644 --- a/src/tbb/queuing_mutex.cpp +++ b/src/tbb/queuing_mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/queuing_rw_mutex.cpp b/src/tbb/queuing_rw_mutex.cpp index 2ed20cd..790003e 100644 --- a/src/tbb/queuing_rw_mutex.cpp +++ b/src/tbb/queuing_rw_mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/reader_writer_lock.cpp b/src/tbb/reader_writer_lock.cpp index fd13aca..120c841 100644 --- a/src/tbb/reader_writer_lock.cpp +++ b/src/tbb/reader_writer_lock.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/recursive_mutex.cpp b/src/tbb/recursive_mutex.cpp index 0977539..55438b0 100644 --- a/src/tbb/recursive_mutex.cpp +++ b/src/tbb/recursive_mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/scheduler.cpp b/src/tbb/scheduler.cpp index 288bd1a..0f10afc 100644 --- a/src/tbb/scheduler.cpp +++ b/src/tbb/scheduler.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/scheduler.h b/src/tbb/scheduler.h index 3f5a35c..c96ba6d 100644 --- a/src/tbb/scheduler.h +++ b/src/tbb/scheduler.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/scheduler_common.h b/src/tbb/scheduler_common.h index 2afd1a1..852ea39 100644 --- a/src/tbb/scheduler_common.h +++ b/src/tbb/scheduler_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/scheduler_utility.h b/src/tbb/scheduler_utility.h index 6e84472..2d6899f 100644 --- a/src/tbb/scheduler_utility.h +++ b/src/tbb/scheduler_utility.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/semaphore.cpp b/src/tbb/semaphore.cpp index 853bece..3fad8aa 100644 --- a/src/tbb/semaphore.cpp +++ b/src/tbb/semaphore.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/semaphore.h b/src/tbb/semaphore.h index d02bf00..ce263d4 100644 --- a/src/tbb/semaphore.h +++ b/src/tbb/semaphore.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/spin_mutex.cpp b/src/tbb/spin_mutex.cpp index 150af22..4278ded 100644 --- a/src/tbb/spin_mutex.cpp +++ b/src/tbb/spin_mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/spin_rw_mutex.cpp b/src/tbb/spin_rw_mutex.cpp index 37078d1..d87f57c 100644 --- a/src/tbb/spin_rw_mutex.cpp +++ b/src/tbb/spin_rw_mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/task.cpp b/src/tbb/task.cpp index e8e7e46..7dc497e 100644 --- a/src/tbb/task.cpp +++ b/src/tbb/task.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/task_group_context.cpp b/src/tbb/task_group_context.cpp index f20ae30..23f564d 100644 --- a/src/tbb/task_group_context.cpp +++ b/src/tbb/task_group_context.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/task_stream.h b/src/tbb/task_stream.h index 30aac2c..f951163 100644 --- a/src/tbb/task_stream.h +++ b/src/tbb/task_stream.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/task_stream_extended.h b/src/tbb/task_stream_extended.h index 4ff34aa..ee039da 100644 --- a/src/tbb/task_stream_extended.h +++ b/src/tbb/task_stream_extended.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_assert_impl.h b/src/tbb/tbb_assert_impl.h index 9032adb..141b47e 100644 --- a/src/tbb/tbb_assert_impl.h +++ b/src/tbb/tbb_assert_impl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,6 +18,9 @@ */ +#ifndef _TBB_assert_impl_H +#define _TBB_assert_impl_H + // IMPORTANT: To use assertion handling in TBB, exactly one of the TBB source files // should #include tbb_assert_impl.h thus instantiating assertion handling routines. // The intent of putting it to a separate file is to allow some tests to use it @@ -99,3 +102,5 @@ namespace tbb { #else } // namespace tbb #endif + +#endif /*_TBB_assert_impl_H*/ diff --git a/src/tbb/tbb_environment.h b/src/tbb/tbb_environment.h index bde3fd6..de9cbb2 100644 --- a/src/tbb/tbb_environment.h +++ b/src/tbb/tbb_environment.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_main.cpp b/src/tbb/tbb_main.cpp index 060fdb7..032a918 100644 --- a/src/tbb/tbb_main.cpp +++ b/src/tbb/tbb_main.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_main.h b/src/tbb/tbb_main.h index b84357b..0ba4ac0 100644 --- a/src/tbb/tbb_main.h +++ b/src/tbb/tbb_main.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_misc.cpp b/src/tbb/tbb_misc.cpp index 23bc1ff..f02fb51 100644 --- a/src/tbb/tbb_misc.cpp +++ b/src/tbb/tbb_misc.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_misc.h b/src/tbb/tbb_misc.h index c1584e3..2db3164 100644 --- a/src/tbb/tbb_misc.h +++ b/src/tbb/tbb_misc.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_misc_ex.cpp b/src/tbb/tbb_misc_ex.cpp index ae2e498..b50aa21 100644 --- a/src/tbb/tbb_misc_ex.cpp +++ b/src/tbb/tbb_misc_ex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_resource.rc b/src/tbb/tbb_resource.rc index 0dac864..c2f3968 100644 --- a/src/tbb/tbb_resource.rc +++ b/src/tbb/tbb_resource.rc @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ BEGIN VALUE "CompanyName", "Intel Corporation\0" VALUE "FileDescription", "Intel(R) Threading Building Blocks library\0" VALUE "FileVersion", TBB_VERSION "\0" - VALUE "LegalCopyright", "Copyright 2005-2018 Intel Corporation. All Rights Reserved.\0" + VALUE "LegalCopyright", "Copyright 2005-2019 Intel Corporation. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" #ifndef TBB_USE_DEBUG VALUE "OriginalFilename", "tbb.dll\0" diff --git a/src/tbb/tbb_statistics.cpp b/src/tbb/tbb_statistics.cpp index a04c8c9..9bbc22a 100644 --- a/src/tbb/tbb_statistics.cpp +++ b/src/tbb/tbb_statistics.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_statistics.h b/src/tbb/tbb_statistics.h index aba5506..4ee9fb6 100644 --- a/src/tbb/tbb_statistics.h +++ b/src/tbb/tbb_statistics.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_thread.cpp b/src/tbb/tbb_thread.cpp index 0bcb76e..d5da163 100644 --- a/src/tbb/tbb_thread.cpp +++ b/src/tbb/tbb_thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tbb_version.h b/src/tbb/tbb_version.h index dcaa55b..000250b 100644 --- a/src/tbb/tbb_version.h +++ b/src/tbb/tbb_version.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tls.h b/src/tbb/tls.h index 4bae634..685f6fe 100644 --- a/src/tbb/tls.h +++ b/src/tbb/tls.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/disable_warnings.h b/src/tbb/tools_api/disable_warnings.h index 6725ddc..c4e9bf8 100644 --- a/src/tbb/tools_api/disable_warnings.h +++ b/src/tbb/tools_api/disable_warnings.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/ittnotify.h b/src/tbb/tools_api/ittnotify.h index 433477e..89b0058 100644 --- a/src/tbb/tools_api/ittnotify.h +++ b/src/tbb/tools_api/ittnotify.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h index 9956232..eda49f2 100644 --- a/src/tbb/tools_api/ittnotify_config.h +++ b/src/tbb/tools_api/ittnotify_config.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/ittnotify_static.c b/src/tbb/tools_api/ittnotify_static.c index dab25fa..1bd1d2e 100644 --- a/src/tbb/tools_api/ittnotify_static.c +++ b/src/tbb/tools_api/ittnotify_static.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/ittnotify_static.h b/src/tbb/tools_api/ittnotify_static.h index ec93aad..2ce265d 100644 --- a/src/tbb/tools_api/ittnotify_static.h +++ b/src/tbb/tools_api/ittnotify_static.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/ittnotify_types.h b/src/tbb/tools_api/ittnotify_types.h index 2c0f5da..5ee3c92 100644 --- a/src/tbb/tools_api/ittnotify_types.h +++ b/src/tbb/tools_api/ittnotify_types.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/tools_api/legacy/ittnotify.h b/src/tbb/tools_api/legacy/ittnotify.h index a3d8d2e..3ec0e1b 100644 --- a/src/tbb/tools_api/legacy/ittnotify.h +++ b/src/tbb/tools_api/legacy/ittnotify.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/win32-tbb-export.def b/src/tbb/win32-tbb-export.def index d6567c4..cc6f3d4 100644 --- a/src/tbb/win32-tbb-export.def +++ b/src/tbb/win32-tbb-export.def @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/win32-tbb-export.lst b/src/tbb/win32-tbb-export.lst index ee28097..70d1132 100644 --- a/src/tbb/win32-tbb-export.lst +++ b/src/tbb/win32-tbb-export.lst @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/win64-gcc-tbb-export.def b/src/tbb/win64-gcc-tbb-export.def index 22c181c..ba32740 100644 --- a/src/tbb/win64-gcc-tbb-export.def +++ b/src/tbb/win64-gcc-tbb-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/win64-gcc-tbb-export.lst b/src/tbb/win64-gcc-tbb-export.lst index 5c8b67a..891d541 100644 --- a/src/tbb/win64-gcc-tbb-export.lst +++ b/src/tbb/win64-gcc-tbb-export.lst @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbb/win64-tbb-export.def b/src/tbb/win64-tbb-export.def index 776dd5a..7226b21 100644 --- a/src/tbb/win64-tbb-export.def +++ b/src/tbb/win64-tbb-export.def @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/win64-tbb-export.lst b/src/tbb/win64-tbb-export.lst index e7639c7..1c7ee5f 100644 --- a/src/tbb/win64-tbb-export.lst +++ b/src/tbb/win64-tbb-export.lst @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/winrt-tbb-export.lst b/src/tbb/winrt-tbb-export.lst index e30e629..2facc9c 100644 --- a/src/tbb/winrt-tbb-export.lst +++ b/src/tbb/winrt-tbb-export.lst @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbb/x86_rtm_rw_mutex.cpp b/src/tbb/x86_rtm_rw_mutex.cpp index ebf9d0c..be4a368 100644 --- a/src/tbb/x86_rtm_rw_mutex.cpp +++ b/src/tbb/x86_rtm_rw_mutex.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/Customize.h b/src/tbbmalloc/Customize.h index 49866ac..c0aa06b 100644 --- a/src/tbbmalloc/Customize.h +++ b/src/tbbmalloc/Customize.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // customizing MALLOC_ASSERT macro #include "tbb/tbb_stddef.h" #define MALLOC_ASSERT(assertion, message) __TBB_ASSERT(assertion, message) +#define MALLOC_ASSERT_EX(assertion, message) __TBB_ASSERT_EX(assertion, message) #ifndef MALLOC_DEBUG #define MALLOC_DEBUG TBB_USE_DEBUG diff --git a/src/tbbmalloc/MapMemory.h b/src/tbbmalloc/MapMemory.h index 545555c..04222ff 100644 --- a/src/tbbmalloc/MapMemory.h +++ b/src/tbbmalloc/MapMemory.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/Statistics.h b/src/tbbmalloc/Statistics.h index ead9cc0..1a9077f 100644 --- a/src/tbbmalloc/Statistics.h +++ b/src/tbbmalloc/Statistics.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/Synchronize.h b/src/tbbmalloc/Synchronize.h index ce6a118..def91fa 100644 --- a/src/tbbmalloc/Synchronize.h +++ b/src/tbbmalloc/Synchronize.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/TypeDefinitions.h b/src/tbbmalloc/TypeDefinitions.h index 79110e5..199ad61 100644 --- a/src/tbbmalloc/TypeDefinitions.h +++ b/src/tbbmalloc/TypeDefinitions.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/backend.cpp b/src/tbbmalloc/backend.cpp index 44d3bcc..6cda7ec 100644 --- a/src/tbbmalloc/backend.cpp +++ b/src/tbbmalloc/backend.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/backref.cpp b/src/tbbmalloc/backref.cpp index ae8e66a..d75e0e6 100644 --- a/src/tbbmalloc/backref.cpp +++ b/src/tbbmalloc/backref.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/frontend.cpp b/src/tbbmalloc/frontend.cpp index d4c489e..70fd80b 100644 --- a/src/tbbmalloc/frontend.cpp +++ b/src/tbbmalloc/frontend.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -2431,8 +2431,8 @@ bool isLargeObject(void *object) if (!isAligned(object, largeObjectAlignment)) return false; LargeObjectHdr *header = (LargeObjectHdr*)object - 1; - BackRefIdx idx = memOrigin==unknownMem? safer_dereference(&header->backRefIdx) : - header->backRefIdx; + BackRefIdx idx = (memOrigin == unknownMem) ? + safer_dereference(&header->backRefIdx) : header->backRefIdx; return idx.isLargeObject() // in valid LargeObjectHdr memoryBlock is not NULL @@ -2607,19 +2607,15 @@ static void internalFree(void *object) static size_t internalMsize(void* ptr) { - if (ptr) { - MALLOC_ASSERT(isRecognized(ptr), "Invalid pointer in scalable_msize detected."); - if (isLargeObject(ptr)) { - // TODO: return the maximum memory size, that can be written to this object - LargeMemoryBlock* lmb = ((LargeObjectHdr*)ptr - 1)->memoryBlock; - return lmb->objectSize; - } else - return ((Block*)alignDown(ptr, slabSize))->findObjectSize(ptr); + MALLOC_ASSERT(ptr, "Invalid pointer passed to internalMsize"); + if (isLargeObject(ptr)) { + // TODO: return the maximum memory size, that can be written to this object + LargeMemoryBlock* lmb = ((LargeObjectHdr*)ptr - 1)->memoryBlock; + return lmb->objectSize; + } else { + Block *block = (Block*)alignDown(ptr, slabSize); + return block->findObjectSize(ptr); } - errno = EINVAL; - // Unlike _msize, return 0 in case of parameter error. - // Returning size_t(-1) looks more like the way to troubles. - return 0; } } // namespace internal @@ -2754,6 +2750,21 @@ rml::MemoryPool *pool_identify(void *object) return (rml::MemoryPool*)pool; } +size_t pool_msize(rml::MemoryPool *mPool, void* object) +{ + if (object) { + // No assert for object recognition, cause objects allocated from non-default + // memory pool do not participate in range checking and do not have valid backreferences for + // small objects. Instead, check that an object belong to the certain memory pool. + MALLOC_ASSERT_EX(mPool == pool_identify(object), "Object does not belong to the specified pool"); + return internalMsize(object); + } + errno = EINVAL; + // Unlike _msize, return 0 in case of parameter error. + // Returning size_t(-1) looks more like the way to troubles. + return 0; +} + } // namespace rml using namespace rml::internal; @@ -2877,12 +2888,14 @@ extern "C" void * scalable_malloc(size_t size) return ptr; } -extern "C" void scalable_free (void *object) { +extern "C" void scalable_free(void *object) +{ internalFree(object); } #if MALLOC_ZONE_OVERLOAD_ENABLED -extern "C" void __TBB_malloc_free_definite_size(void *object, size_t size) { +extern "C" void __TBB_malloc_free_definite_size(void *object, size_t size) +{ internalPoolFree(defaultMemPool, object, size); } #endif @@ -3133,7 +3146,14 @@ extern "C" void scalable_aligned_free(void *ptr) */ extern "C" size_t scalable_msize(void* ptr) { - return internalMsize(ptr); + if (ptr) { + MALLOC_ASSERT(isRecognized(ptr), "Invalid pointer in scalable_msize detected."); + return internalMsize(ptr); + } + errno = EINVAL; + // Unlike _msize, return 0 in case of parameter error. + // Returning size_t(-1) looks more like the way to troubles. + return 0; } /* diff --git a/src/tbbmalloc/index.html b/src/tbbmalloc/index.html index d39803a..b53ea94 100644 --- a/src/tbbmalloc/index.html +++ b/src/tbbmalloc/index.html @@ -7,7 +7,7 @@ This directory contains the Intel® Threading Building Blocks (Intel® TBB

-Copyright © 2005-2018 Intel Corporation. All Rights Reserved. +Copyright © 2005-2019 Intel Corporation. All Rights Reserved.

Intel is a registered trademark or trademark of Intel Corporation or its subsidiaries in the United States and other countries. diff --git a/src/tbbmalloc/large_objects.cpp b/src/tbbmalloc/large_objects.cpp index 07d1294..48ee40f 100644 --- a/src/tbbmalloc/large_objects.cpp +++ b/src/tbbmalloc/large_objects.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/lin32-proxy-export.def b/src/tbbmalloc/lin32-proxy-export.def index 387f436..c971d34 100644 --- a/src/tbbmalloc/lin32-proxy-export.def +++ b/src/tbbmalloc/lin32-proxy-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/lin32-tbbmalloc-export.def b/src/tbbmalloc/lin32-tbbmalloc-export.def index 303e19c..d0f06c6 100644 --- a/src/tbbmalloc/lin32-tbbmalloc-export.def +++ b/src/tbbmalloc/lin32-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -49,6 +49,7 @@ _ZN3rml12pool_reallocEPNS_10MemoryPoolEPvj; _ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvjj; _ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEjj; _ZN3rml13pool_identifyEPv; +_ZN3rml10pool_msizeEPNS_10MemoryPoolEPv; local: diff --git a/src/tbbmalloc/lin64-proxy-export.def b/src/tbbmalloc/lin64-proxy-export.def index 0bf8624..684e7c0 100644 --- a/src/tbbmalloc/lin64-proxy-export.def +++ b/src/tbbmalloc/lin64-proxy-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/lin64-tbbmalloc-export.def b/src/tbbmalloc/lin64-tbbmalloc-export.def index e954bfe..18ebd26 100644 --- a/src/tbbmalloc/lin64-tbbmalloc-export.def +++ b/src/tbbmalloc/lin64-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -49,6 +49,7 @@ _ZN3rml12pool_reallocEPNS_10MemoryPoolEPvm; _ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvmm; _ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEmm; _ZN3rml13pool_identifyEPv; +_ZN3rml10pool_msizeEPNS_10MemoryPoolEPv; local: diff --git a/src/tbbmalloc/lin64ipf-proxy-export.def b/src/tbbmalloc/lin64ipf-proxy-export.def index 0bf8624..684e7c0 100644 --- a/src/tbbmalloc/lin64ipf-proxy-export.def +++ b/src/tbbmalloc/lin64ipf-proxy-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/lin64ipf-tbbmalloc-export.def b/src/tbbmalloc/lin64ipf-tbbmalloc-export.def index 9cbfce7..e850a9b 100644 --- a/src/tbbmalloc/lin64ipf-tbbmalloc-export.def +++ b/src/tbbmalloc/lin64ipf-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -52,6 +52,7 @@ _ZN3rml12pool_reallocEPNS_10MemoryPoolEPvm; _ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvmm; _ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEmm; _ZN3rml13pool_identifyEPv; +_ZN3rml10pool_msizeEPNS_10MemoryPoolEPv; local: diff --git a/src/tbbmalloc/mac32-tbbmalloc-export.def b/src/tbbmalloc/mac32-tbbmalloc-export.def index 24ab729..7de9b25 100644 --- a/src/tbbmalloc/mac32-tbbmalloc-export.def +++ b/src/tbbmalloc/mac32-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 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,3 +46,5 @@ __ZN3rml12pool_reallocEPNS_10MemoryPoolEPvm __ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvmm __ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEmm __ZN3rml13pool_identifyEPv +__ZN3rml10pool_msizeEPNS_10MemoryPoolEPv + diff --git a/src/tbbmalloc/mac64-tbbmalloc-export.def b/src/tbbmalloc/mac64-tbbmalloc-export.def index 24ab729..7de9b25 100644 --- a/src/tbbmalloc/mac64-tbbmalloc-export.def +++ b/src/tbbmalloc/mac64-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 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,3 +46,5 @@ __ZN3rml12pool_reallocEPNS_10MemoryPoolEPvm __ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvmm __ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEmm __ZN3rml13pool_identifyEPv +__ZN3rml10pool_msizeEPNS_10MemoryPoolEPv + diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp index 2cc0548..6915525 100644 --- a/src/tbbmalloc/proxy.cpp +++ b/src/tbbmalloc/proxy.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 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,7 @@ /*** internal global operator new implementation (Linux, Windows) ***/ #include -// Synchronization primitives to protect original library pointers and new_handler +// Synchronization primitives to protect original library pointers and new_handler #include "Synchronize.h" #if __TBB_MSVC_PART_WORD_INTERLOCKED_INTRINSICS_PRESENT @@ -670,7 +670,7 @@ bool BytecodesAreKnown(const unicode_char_t *dllName) if (!module) return false; for (int i=0; funcName[i]; i++) - if (! IsPrologueKnown(module, funcName[i], known_bytecodes)) { + if (! IsPrologueKnown(dllName, funcName[i], known_bytecodes, module)) { fprintf(stderr, "TBBmalloc: skip allocation functions replacement in " WCHAR_SPEC ": unknown prologue for function " WCHAR_SPEC "\n", dllName, funcName[i]); return false; @@ -739,13 +739,14 @@ void doMallocReplacement() ReplaceFunctionWithStore( modules_to_replace[j].name, c_routines_to_replace[i]._func, c_routines_to_replace[i]._fptr, NULL, NULL, c_routines_to_replace[i]._on_error ); } if ( strcmp(modules_to_replace[j].name, "ucrtbase.dll") == 0 ) { + HMODULE ucrtbase_handle = GetModuleHandle("ucrtbase.dll"); // If _o_free function is present and patchable, redirect it to tbbmalloc as well // This prevents issues with other _o_* functions which might allocate memory with malloc - if ( IsPrologueKnown(GetModuleHandle("ucrtbase.dll"), "_o_free", known_bytecodes) ) { + if ( IsPrologueKnown("ucrtbase.dll", "_o_free", known_bytecodes, ucrtbase_handle)) { ReplaceFunctionWithStore( "ucrtbase.dll", "_o_free", (FUNCPTR)__TBB_malloc__o_free, known_bytecodes, (FUNCPTR*)&orig__o_free, FRR_FAIL ); } // Similarly for _free_base - if (IsPrologueKnown(GetModuleHandle("ucrtbase.dll"), "_free_base", known_bytecodes)) { + if (IsPrologueKnown("ucrtbase.dll", "_free_base", known_bytecodes, ucrtbase_handle)) { ReplaceFunctionWithStore("ucrtbase.dll", "_free_base", (FUNCPTR)__TBB_malloc__free_base, known_bytecodes, (FUNCPTR*)&orig__free_base, FRR_FAIL); } // ucrtbase.dll does not export operator new/delete, so skip the rest of the loop. diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h index b92a396..c0ffc08 100644 --- a/src/tbbmalloc/proxy.h +++ b/src/tbbmalloc/proxy.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/proxy_overload_osx.h b/src/tbbmalloc/proxy_overload_osx.h index 089f7be..62ae3b6 100644 --- a/src/tbbmalloc/proxy_overload_osx.h +++ b/src/tbbmalloc/proxy_overload_osx.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/shared_utils.h b/src/tbbmalloc/shared_utils.h index 2bbd213..269ef7d 100644 --- a/src/tbbmalloc/shared_utils.h +++ b/src/tbbmalloc/shared_utils.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/tbb_function_replacement.cpp b/src/tbbmalloc/tbb_function_replacement.cpp index 93a519e..f2ebb38 100644 --- a/src/tbbmalloc/tbb_function_replacement.cpp +++ b/src/tbbmalloc/tbb_function_replacement.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +22,18 @@ #if !__TBB_WIN8UI_SUPPORT && defined(_WIN32) +#ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE 1 +#endif #define __TBB_NO_IMPLICIT_LINKAGE 1 +// no standard-conforming implementation of snprintf prior to VS 2015 +#if !defined(_MSC_VER) || _MSC_VER>=1900 +#define LOG_PRINT(s, n, format, ...) snprintf(s, n, format, __VA_ARGS__) +#else +#define LOG_PRINT(s, n, format, ...) _snprintf_s(s, n, _TRUNCATE, format, __VA_ARGS__) +#endif + #include #include #include @@ -34,6 +43,57 @@ #include "tbb/tbb_stddef.h" #include "../tbb/tbb_assert_impl.h" +// The information about a standard memory allocation function for the replacement log +struct FunctionInfo { + const char* funcName; + const char* dllName; +}; + +// Namespace that processes and manages the output of records to the Log journal +// that will be provided to user by TBB_malloc_replacement_log() +namespace Log { + // Value of RECORDS_COUNT is set due to the fact that we maximally + // scan 8 modules, and in every module we can swap 6 opcodes. (rounded to 8) + static const unsigned RECORDS_COUNT = 8 * 8; + static const unsigned RECORD_LENGTH = MAX_PATH; + + // Need to add 1 to count of records, because last record must be always NULL + static char *records[RECORDS_COUNT + 1]; + static bool replacement_status = true; + + // Internal counter, thats contain number of next string for record + static unsigned record_number = 0; + + // Function that writes info about (not)found opcodes to the Log journal + // functionInfo - information about a standard memory allocation function for the replacement log + // opcodeString - string, that contain byte code of this function + // status - information about function replacement status + static void record(FunctionInfo functionInfo, const char * opcodeString, bool status) { + __TBB_ASSERT(functionInfo.dllName, "Empty DLL name value"); + __TBB_ASSERT(functionInfo.funcName, "Empty function name value"); + __TBB_ASSERT(opcodeString, "Empty opcode"); + __TBB_ASSERT(record_number <= RECORDS_COUNT, "Incorrect record number"); + + //If some replacement failed -> set status to false + replacement_status &= status; + + // If we reach the end of the log, write this message to the last line + if (record_number == RECORDS_COUNT) { + // %s - workaround to fix empty variable argument parsing behavior in GCC + LOG_PRINT(records[RECORDS_COUNT - 1], RECORD_LENGTH, "%s", "Log was truncated."); + return; + } + + char* entry = (char*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, RECORD_LENGTH); + __TBB_ASSERT(entry, "Invalid memory was returned"); + + LOG_PRINT(entry, RECORD_LENGTH, "%s: %s (%s), byte pattern: <%s>", + status ? "Success" : "Fail", functionInfo.funcName, functionInfo.dllName, opcodeString); + + records[record_number++] = entry; + } +}; + inline UINT_PTR Ptr2Addrint(LPVOID ptr) { Int2Ptr i2p; @@ -195,14 +255,14 @@ size_t compareStrings( const char *str1, const char *str2 ) // Dictionary contains opcodes for several full asm instructions // + one opcode byte for the next asm instruction for safe address processing // RETURN: 1 + the index of the matched pattern, or 0 if no match found. -static UINT CheckOpcodes( const char ** opcodes, void *inpAddr, bool abortOnError ) +static UINT CheckOpcodes( const char ** opcodes, void *inpAddr, bool abortOnError, const FunctionInfo* functionInfo = NULL) { static size_t opcodesStringsCount = 0; static size_t maxOpcodesLength = 0; static size_t opcodes_pointer = (size_t)opcodes; char opcodeString[2*MAX_PATTERN_SIZE+1]; size_t i; - size_t result; + size_t result = 0; // Get the values for static variables // max length and number of patterns @@ -225,8 +285,15 @@ static UINT CheckOpcodes( const char ** opcodes, void *inpAddr, bool abortOnErro // Compare translated opcodes with patterns for( UINT idx=0; idx return false status + return Log::replacement_status && Log::records[0] != NULL ? 0 : -1; } #endif /* !__TBB_WIN8UI_SUPPORT && defined(_WIN32) */ diff --git a/src/tbbmalloc/tbb_function_replacement.h b/src/tbbmalloc/tbb_function_replacement.h index 35dc538..2a7486e 100644 --- a/src/tbbmalloc/tbb_function_replacement.h +++ b/src/tbbmalloc/tbb_function_replacement.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ typedef void (*FUNCPTR)(); FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc=NULL); FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc=NULL); -bool IsPrologueKnown(HMODULE module, const char *funcName, const char **opcodes); +bool IsPrologueKnown(const char* dllName, const char *funcName, const char **opcodes, HMODULE module); // Utilities to convert between ADDRESS and LPVOID union Int2Ptr { diff --git a/src/tbbmalloc/tbbmalloc.cpp b/src/tbbmalloc/tbbmalloc.cpp index bab6e79..bf978a7 100644 --- a/src/tbbmalloc/tbbmalloc.cpp +++ b/src/tbbmalloc/tbbmalloc.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/tbbmalloc.rc b/src/tbbmalloc/tbbmalloc.rc index 546c741..9cbc131 100644 --- a/src/tbbmalloc/tbbmalloc.rc +++ b/src/tbbmalloc/tbbmalloc.rc @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2018 Intel Corporation +// Copyright (c) 2005-2019 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ BEGIN VALUE "CompanyName", "Intel Corporation\0" VALUE "FileDescription", "Scalable Allocator library\0" VALUE "FileVersion", TBBMALLOC_VERSION "\0" - VALUE "LegalCopyright", "Copyright 2005-2018 Intel Corporation. All Rights Reserved.\0" + VALUE "LegalCopyright", "Copyright 2005-2019 Intel Corporation. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" #ifndef TBB_USE_DEBUG VALUE "OriginalFilename", "tbbmalloc.dll\0" diff --git a/src/tbbmalloc/tbbmalloc_internal.h b/src/tbbmalloc/tbbmalloc_internal.h index b173ca1..943973d 100644 --- a/src/tbbmalloc/tbbmalloc_internal.h +++ b/src/tbbmalloc/tbbmalloc_internal.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/tbbmalloc_internal_api.h b/src/tbbmalloc/tbbmalloc_internal_api.h index f9efc38..3df23e2 100644 --- a/src/tbbmalloc/tbbmalloc_internal_api.h +++ b/src/tbbmalloc/tbbmalloc_internal_api.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/tbbmalloc/win32-gcc-tbbmalloc-export.def b/src/tbbmalloc/win32-gcc-tbbmalloc-export.def index e5012d6..aab8a79 100644 --- a/src/tbbmalloc/win32-gcc-tbbmalloc-export.def +++ b/src/tbbmalloc/win32-gcc-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -47,6 +47,7 @@ _ZN3rml12pool_reallocEPNS_10MemoryPoolEPvj; _ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvjj; _ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEjj; _ZN3rml13pool_identifyEPv; +_ZN3rml10pool_msizeEPNS_10MemoryPoolEPv; local:*; }; diff --git a/src/tbbmalloc/win32-tbbmalloc-export.def b/src/tbbmalloc/win32-tbbmalloc-export.def index 0c445de..879baa6 100644 --- a/src/tbbmalloc/win32-tbbmalloc-export.def +++ b/src/tbbmalloc/win32-tbbmalloc-export.def @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. @@ -45,3 +45,5 @@ __TBB_malloc_safer_aligned_realloc ?pool_aligned_realloc@rml@@YAPAXPAVMemoryPool@1@PAXII@Z ?pool_aligned_malloc@rml@@YAPAXPAVMemoryPool@1@II@Z ?pool_identify@rml@@YAPAVMemoryPool@1@PAX@Z +?pool_msize@rml@@YAIPAVMemoryPool@1@PAX@Z + diff --git a/src/tbbmalloc/win64-gcc-tbbmalloc-export.def b/src/tbbmalloc/win64-gcc-tbbmalloc-export.def index 4b3c24b..94bea4e 100644 --- a/src/tbbmalloc/win64-gcc-tbbmalloc-export.def +++ b/src/tbbmalloc/win64-gcc-tbbmalloc-export.def @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -47,6 +47,7 @@ _ZN3rml12pool_reallocEPNS_10MemoryPoolEPvy; _ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvyy; _ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEyy; _ZN3rml13pool_identifyEPv; +_ZN3rml10pool_msizeEPNS_10MemoryPoolEPv; local:*; }; diff --git a/src/tbbmalloc/win64-tbbmalloc-export.def b/src/tbbmalloc/win64-tbbmalloc-export.def index 095f2ce..b0a20f7 100644 --- a/src/tbbmalloc/win64-tbbmalloc-export.def +++ b/src/tbbmalloc/win64-tbbmalloc-export.def @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 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,3 +46,5 @@ __TBB_malloc_safer_aligned_realloc ?pool_aligned_realloc@rml@@YAPEAXPEAVMemoryPool@1@PEAX_K2@Z ?pool_aligned_malloc@rml@@YAPEAXPEAVMemoryPool@1@_K1@Z ?pool_identify@rml@@YAPEAVMemoryPool@1@PEAX@Z +?pool_msize@rml@@YA_KPEAVMemoryPool@1@PEAX@Z + diff --git a/src/tbbproxy/tbbproxy-windows.asm b/src/tbbproxy/tbbproxy-windows.asm index d0dcb8f..de0725e 100644 --- a/src/tbbproxy/tbbproxy-windows.asm +++ b/src/tbbproxy/tbbproxy-windows.asm @@ -1,4 +1,4 @@ -; Copyright (c) 2005-2018 Intel Corporation +; Copyright (c) 2005-2019 Intel Corporation ; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. diff --git a/src/tbbproxy/tbbproxy.cpp b/src/tbbproxy/tbbproxy.cpp index 5b40b86..c14d54b 100644 --- a/src/tbbproxy/tbbproxy.cpp +++ b/src/tbbproxy/tbbproxy.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness.h b/src/test/harness.h index 4e2f178..2bd1060 100644 --- a/src/test/harness.h +++ b/src/test/harness.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_allocator.h b/src/test/harness_allocator.h index d57bb96..3e10183 100644 --- a/src/test/harness_allocator.h +++ b/src/test/harness_allocator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -579,6 +579,77 @@ public: }; +template +class pmr_stateful_allocator +{ +private: + pmr_stateful_allocator& operator=(const pmr_stateful_allocator&); /* = deleted */ +public: + typedef T value_type; + typedef Harness::false_type propagate_on_container_move_assignment; + typedef Harness::false_type propagate_on_container_copy_assignment; + typedef Harness::false_type propagate_on_container_swap; + +// These types are required in C++03 +#if !__TBB_ALLOCATOR_TRAITS_PRESENT + typedef value_type* pointer; + typedef const value_type* const_pointer; + typedef value_type& reference; + typedef const value_type& const_reference; + typedef size_t size_type; + typedef ptrdiff_t difference_type; + template struct rebind { + typedef pmr_stateful_allocator other; + }; +#endif + + pmr_stateful_allocator() throw() : unique_pointer(this) {} + + pmr_stateful_allocator(const pmr_stateful_allocator &a) : unique_pointer(a.unique_pointer) {} + + template + pmr_stateful_allocator(const pmr_stateful_allocator &a) throw() : unique_pointer(a.unique_pointer) {} + + value_type* allocate( size_t n, const void* /*hint*/ = 0 ) { + return static_cast( malloc( n * sizeof(value_type) ) ); + } + + void deallocate( value_type* p, size_t ) { + free( p ); + } + +#if __TBB_ALLOCATOR_CONSTRUCT_VARIADIC + //! Copy-construct value at location pointed to by p. + template + void construct(U *p, Args&&... args) + { + ::new((void *)p) U(std::forward(args)...); + } +#else // __TBB_ALLOCATOR_CONSTRUCT_VARIADIC +#if __TBB_CPP11_RVALUE_REF_PRESENT + void construct(value_type* p, value_type&& value) { ::new((void*)(p)) value_type(std::move(value)); } +#endif + void construct(value_type* p, const value_type& value) { ::new((void*)(p)) value_type(value); } +#endif // __TBB_ALLOCATOR_CONSTRUCT_VARIADIC + + //! Destroy value at location pointed to by p. + void destroy(value_type* p) { + p->~value_type(); + // suppress "unreferenced parameter" warnings by MSVC up to and including 2015 + tbb::internal::suppress_unused_warning(p); + } + + friend bool operator==(pmr_stateful_allocator const& lhs, pmr_stateful_allocator const& rhs){ + return lhs.unique_pointer == rhs.unique_pointer; + } + + friend bool operator!=(pmr_stateful_allocator const& rhs, pmr_stateful_allocator const& lhs){ + return !(lhs == rhs); + } + + void* unique_pointer; +}; + #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) // Workaround for overzealous compiler warnings #pragma warning (pop) diff --git a/src/test/harness_allocator_overload.h b/src/test/harness_allocator_overload.h index 2397863..f59684d 100644 --- a/src/test/harness_allocator_overload.h +++ b/src/test/harness_allocator_overload.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_assert.h b/src/test/harness_assert.h index 3fc8e5a..ed7bfbe 100644 --- a/src/test/harness_assert.h +++ b/src/test/harness_assert.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_bad_expr.h b/src/test/harness_bad_expr.h index a4eb2e3..9b98219 100644 --- a/src/test/harness_bad_expr.h +++ b/src/test/harness_bad_expr.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_barrier.h b/src/test/harness_barrier.h index ed290c1..9679fe8 100644 --- a/src/test/harness_barrier.h +++ b/src/test/harness_barrier.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_checktype.h b/src/test/harness_checktype.h index 3053025..7873d24 100644 --- a/src/test/harness_checktype.h +++ b/src/test/harness_checktype.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_concurrency.h b/src/test/harness_concurrency.h index 1135066..8f221e1 100644 --- a/src/test/harness_concurrency.h +++ b/src/test/harness_concurrency.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_concurrency_tracker.h b/src/test/harness_concurrency_tracker.h index 22ac331..84386cd 100644 --- a/src/test/harness_concurrency_tracker.h +++ b/src/test/harness_concurrency_tracker.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_cpu.h b/src/test/harness_cpu.h index ea35873..1d13a9a 100644 --- a/src/test/harness_cpu.h +++ b/src/test/harness_cpu.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_defs.h b/src/test/harness_defs.h index f7727d2..a9a6422 100644 --- a/src/test/harness_defs.h +++ b/src/test/harness_defs.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_dynamic_libs.h b/src/test/harness_dynamic_libs.h index 386c5da..1fe30d8 100644 --- a/src/test/harness_dynamic_libs.h +++ b/src/test/harness_dynamic_libs.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_eh.h b/src/test/harness_eh.h index ae48584..192229d 100644 --- a/src/test/harness_eh.h +++ b/src/test/harness_eh.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_fp.h b/src/test/harness_fp.h index 5ad4095..f79cf42 100644 --- a/src/test/harness_fp.h +++ b/src/test/harness_fp.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_graph.h b/src/test/harness_graph.h index 56bd126..cfd5cfd 100644 --- a/src/test/harness_graph.h +++ b/src/test/harness_graph.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_inject_scheduler.h b/src/test/harness_inject_scheduler.h index 9c6cd66..4ba8d99 100644 --- a/src/test/harness_inject_scheduler.h +++ b/src/test/harness_inject_scheduler.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_iterator.h b/src/test/harness_iterator.h index 3155e54..dc8bba2 100644 --- a/src/test/harness_iterator.h +++ b/src/test/harness_iterator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_m128.h b/src/test/harness_m128.h index 606c3a0..aadb2f6 100644 --- a/src/test/harness_m128.h +++ b/src/test/harness_m128.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_memory.h b/src/test/harness_memory.h index 57c8249..c5290f0 100644 --- a/src/test/harness_memory.h +++ b/src/test/harness_memory.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_mic.h b/src/test/harness_mic.h index fe81b19..02f0c45 100644 --- a/src/test/harness_mic.h +++ b/src/test/harness_mic.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_preload.h b/src/test/harness_preload.h index 7e3c87a..b3830b6 100644 --- a/src/test/harness_preload.h +++ b/src/test/harness_preload.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_report.h b/src/test/harness_report.h index 6b857cd..a1ca110 100644 --- a/src/test/harness_report.h +++ b/src/test/harness_report.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_runtime_loader.h b/src/test/harness_runtime_loader.h index 7ed4dfb..d1a3f14 100644 --- a/src/test/harness_runtime_loader.h +++ b/src/test/harness_runtime_loader.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_state_trackable.h b/src/test/harness_state_trackable.h index ddb98b4..86f11fd 100644 --- a/src/test/harness_state_trackable.h +++ b/src/test/harness_state_trackable.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_task.h b/src/test/harness_task.h index 78a0b72..bd65834 100644 --- a/src/test/harness_task.h +++ b/src/test/harness_task.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_tbb_independence.h b/src/test/harness_tbb_independence.h index 2cfce82..2b3f30d 100644 --- a/src/test/harness_tbb_independence.h +++ b/src/test/harness_tbb_independence.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_test_cases_framework.h b/src/test/harness_test_cases_framework.h index d4fe70f..a3aa159 100644 --- a/src/test/harness_test_cases_framework.h +++ b/src/test/harness_test_cases_framework.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_tls.h b/src/test/harness_tls.h index c483a6a..34706b0 100644 --- a/src/test/harness_tls.h +++ b/src/test/harness_tls.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/harness_tsx.h b/src/test/harness_tsx.h index 688acf1..194003f 100644 --- a/src/test/harness_tsx.h +++ b/src/test/harness_tsx.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_ScalableAllocator.cpp b/src/test/test_ScalableAllocator.cpp index 5113f8c..91ee2e5 100644 --- a/src/test/test_ScalableAllocator.cpp +++ b/src/test/test_ScalableAllocator.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_ScalableAllocator_STL.cpp b/src/test/test_ScalableAllocator_STL.cpp index 6e07435..cad44c8 100644 --- a/src/test/test_ScalableAllocator_STL.cpp +++ b/src/test/test_ScalableAllocator_STL.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 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,6 +27,7 @@ #include "harness_assert.h" #include "tbb/memory_pool.h" #include "tbb/scalable_allocator.h" +#include // The actual body of the test is there: #include "test_allocator_STL.h" @@ -38,5 +39,16 @@ int TestMain () { static char buf[1024*1024*4]; tbb::fixed_pool fpool(buf, sizeof(buf)); TestAllocatorWithSTL(tbb::memory_pool_allocator(fpool) ); + +#if __TBB_CPP17_MEMORY_RESOURCE_PRESENT + ASSERT(!tbb::scalable_memory_resource()->is_equal(*std::pmr::get_default_resource()), + "Scalable resource shouldn't be equal to standard resource." ); + ASSERT(tbb::scalable_memory_resource()->is_equal(*tbb::scalable_memory_resource()), + "Memory that was allocated by one scalable resource should be deallocated by any other instance."); + + typedef std::pmr::polymorphic_allocator pmr_alloc_t; + TestAllocatorWithSTL(pmr_alloc_t(tbb::scalable_memory_resource())); +#endif + return Harness::Done; } diff --git a/src/test/test_aggregator.cpp b/src/test/test_aggregator.cpp index d92cc8a..56900ec 100644 --- a/src/test/test_aggregator.cpp +++ b/src/test/test_aggregator.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_aligned_space.cpp b/src/test/test_aligned_space.cpp index 93f0ae5..a74494a 100644 --- a/src/test/test_aligned_space.cpp +++ b/src/test/test_aligned_space.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_allocator.h b/src/test/test_allocator.h index a9662c9..83e427e 100644 --- a/src/test/test_allocator.h +++ b/src/test/test_allocator.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_allocator_STL.h b/src/test/test_allocator_STL.h index 89e471a..5102ec8 100644 --- a/src/test/test_allocator_STL.h +++ b/src/test/test_allocator_STL.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -94,12 +94,23 @@ struct MoveOperationTracker { template void TestAllocatorWithSTL(const Allocator &a = Allocator() ) { + +// Allocator type convertion section +#if __TBB_ALLOCATOR_TRAITS_PRESENT + typedef typename std::allocator_traits::template rebind_alloc Ai; + typedef typename std::allocator_traits::template rebind_alloc > Acii; +#if _MSC_VER + typedef typename std::allocator_traits::template rebind_alloc Aci; + typedef typename std::allocator_traits::template rebind_alloc > Aii; +#endif // _MSC_VER +#else typedef typename Allocator::template rebind::other Ai; typedef typename Allocator::template rebind >::other Acii; #if _MSC_VER typedef typename Allocator::template rebind::other Aci; typedef typename Allocator::template rebind >::other Aii; -#endif +#endif // _MSC_VER +#endif // __TBB_ALLOCATOR_TRAITS_PRESENT // Sequenced containers TestSequence >(a); @@ -107,11 +118,15 @@ void TestAllocatorWithSTL(const Allocator &a = Allocator() ) { TestSequence >(a); #if __TBB_CPP11_RVALUE_REF_PRESENT +#if __TBB_ALLOCATOR_TRAITS_PRESENT + typedef typename std::allocator_traits::template rebind_alloc Amot; +#else typedef typename Allocator::template rebind::other Amot; +#endif // __TBB_ALLOCATOR_TRAITS_PRESENT TestSequence >(a); TestSequence >(a); TestSequence >(a); -#endif +#endif // __TBB_CPP11_RVALUE_REF_PRESENT // Associative containers TestSet, Ai> >(a); diff --git a/src/test/test_assembly.cpp b/src/test/test_assembly.cpp index 3054a9f..e21e65e 100644 --- a/src/test/test_assembly.cpp +++ b/src/test/test_assembly.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_async_msg.cpp b/src/test/test_async_msg.cpp index b17c53c..fe1b40c 100644 --- a/src/test/test_async_msg.cpp +++ b/src/test/test_async_msg.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_async_node.cpp b/src/test/test_async_node.cpp index 27ccd2c..12d8f01 100644 --- a/src/test/test_async_node.cpp +++ b/src/test/test_async_node.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_atomic.cpp b/src/test/test_atomic.cpp index bea5425..144a29d 100644 --- a/src/test/test_atomic.cpp +++ b/src/test/test_atomic.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_blocked_range.cpp b/src/test/test_blocked_range.cpp index 6f67a3f..5411fd1 100644 --- a/src/test/test_blocked_range.cpp +++ b/src/test/test_blocked_range.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_blocked_range2d.cpp b/src/test/test_blocked_range2d.cpp index b3a878f..e087e15 100644 --- a/src/test/test_blocked_range2d.cpp +++ b/src/test/test_blocked_range2d.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_blocked_range3d.cpp b/src/test/test_blocked_range3d.cpp index 111d7e8..c876126 100644 --- a/src/test/test_blocked_range3d.cpp +++ b/src/test/test_blocked_range3d.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_blocked_rangeNd.cpp b/src/test/test_blocked_rangeNd.cpp index 343c768..21d8dfc 100644 --- a/src/test/test_blocked_rangeNd.cpp +++ b/src/test/test_blocked_rangeNd.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Intel Corporation + Copyright (c) 2017-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_broadcast_node.cpp b/src/test/test_broadcast_node.cpp index 6bff5a9..5690540 100644 --- a/src/test/test_broadcast_node.cpp +++ b/src/test/test_broadcast_node.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_buffer_node.cpp b/src/test/test_buffer_node.cpp index 20f9821..932ee26 100644 --- a/src/test/test_buffer_node.cpp +++ b/src/test/test_buffer_node.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_cache_aligned_allocator.cpp b/src/test/test_cache_aligned_allocator.cpp index 4ca8e36..87be2ea 100644 --- a/src/test/test_cache_aligned_allocator.cpp +++ b/src/test/test_cache_aligned_allocator.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_cache_aligned_allocator_STL.cpp b/src/test/test_cache_aligned_allocator_STL.cpp index 1eb66fd..309ccaa 100644 --- a/src/test/test_cache_aligned_allocator_STL.cpp +++ b/src/test/test_cache_aligned_allocator_STL.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,6 +30,17 @@ int TestMain () { TestAllocatorWithSTL >(); TestAllocatorWithSTL >(); TestAllocatorWithSTL >(); + +#if __TBB_CPP17_MEMORY_RESOURCE_PRESENT + tbb::cache_aligned_resource aligned_resource; + tbb::cache_aligned_resource equal_aligned_resource(std::pmr::get_default_resource()); + ASSERT(aligned_resource.is_equal(equal_aligned_resource), + "Underlying upstream resources should be equal."); + ASSERT(!aligned_resource.is_equal(*std::pmr::null_memory_resource()), + "Cache aligned resource upstream shouldn't be equal to the standard resource."); + TestAllocatorWithSTL(std::pmr::polymorphic_allocator(&aligned_resource)); +#endif + return Harness::Done; } diff --git a/src/test/test_cilk_common.h b/src/test/test_cilk_common.h index e35c3a1..7317fe0 100644 --- a/src/test/test_cilk_common.h +++ b/src/test/test_cilk_common.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_cilk_dynamic_load.cpp b/src/test/test_cilk_dynamic_load.cpp index e120730..886a89e 100644 --- a/src/test/test_cilk_dynamic_load.cpp +++ b/src/test/test_cilk_dynamic_load.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_cilk_interop.cpp b/src/test/test_cilk_interop.cpp index 99b3590..03c24d6 100644 --- a/src/test/test_cilk_interop.cpp +++ b/src/test/test_cilk_interop.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_combinable.cpp b/src/test/test_combinable.cpp index 43e26c6..8de142b 100644 --- a/src/test/test_combinable.cpp +++ b/src/test/test_combinable.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_composite_node.cpp b/src/test/test_composite_node.cpp index 4ce7c7c..8f93a09 100644 --- a/src/test/test_composite_node.cpp +++ b/src/test/test_composite_node.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test_concurrent_hash_map.cpp b/src/test/test_concurrent_hash_map.cpp index 167c826..8196cc6 100644 --- a/src/test/test_concurrent_hash_map.cpp +++ b/src/test/test_concurrent_hash_map.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2018 Intel Corporation + Copyright (c) 2005-2019 Intel Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -1386,6 +1386,76 @@ void TestMoveSupport(){ } #endif //__TBB_CPP11_RVALUE_REF_PRESENT +#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT + +template