Skip to content

Commit bad7566

Browse files
hsbadrhsbadr
committed
Resolved conflicts of TBB headers
1 parent 8c3d280 commit bad7566

File tree

112 files changed

+6
-1
lines changed

Some content is hidden

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

112 files changed

+6
-1
lines changed

inst/include/serial/tbb/parallel_for.h renamed to inst/include/tbb_local/serial/tbb/parallel_for.h

File renamed without changes.

inst/include/serial/tbb/tbb_annotate.h renamed to inst/include/tbb_local/serial/tbb/tbb_annotate.h

File renamed without changes.

inst/include/tbb/aggregator.h renamed to inst/include/tbb_local/tbb/aggregator.h

File renamed without changes.

inst/include/tbb/aligned_space.h renamed to inst/include/tbb_local/tbb/aligned_space.h

File renamed without changes.

inst/include/tbb/atomic.h renamed to inst/include/tbb_local/tbb/atomic.h

File renamed without changes.

inst/include/tbb/blocked_range.h renamed to inst/include/tbb_local/tbb/blocked_range.h

File renamed without changes.

inst/include/tbb/blocked_range2d.h renamed to inst/include/tbb_local/tbb/blocked_range2d.h

File renamed without changes.

inst/include/tbb/blocked_range3d.h renamed to inst/include/tbb_local/tbb/blocked_range3d.h

File renamed without changes.

inst/include/tbb/cache_aligned_allocator.h renamed to inst/include/tbb_local/tbb/cache_aligned_allocator.h

File renamed without changes.

inst/include/tbb/combinable.h renamed to inst/include/tbb_local/tbb/combinable.h

File renamed without changes.

0 commit comments

Comments
 (0)