[oneTBB] Fix namespaces and headers #353
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
omalyshe
reviewed
Sep 2, 2021
| const col_range_type& cols() const; | ||
| }; | ||
| } | ||
| namespace oneapi{ |
There was a problem hiding this comment.
Suggested change
| namespace oneapi{ | |
| namespace oneapi { |
omalyshe
reviewed
Sep 2, 2021
|
|
||
| namespace oneapi { | ||
| namespace tbb { |
There was a problem hiding this comment.
Shouldn't we use indentation for nested namespaces? Some pages use it (see e.g. сontainers/concurrent_vector_cls.rst
@anton-potapov What do you think?
There was a problem hiding this comment.
Agree, some have indentation and some haven't. Let's choose one way, and I will fix it
There was a problem hiding this comment.
Discussed internally and decided to go as-is with this patch and fix indentation later.
source/elements/oneTBB/source/task_scheduler/task_arena/task_scheduler_observer_cls.rst
Outdated
Show resolved
Hide resolved
- typo fix
omalyshe
reviewed
Sep 15, 2021
|
|
||
| std::allocator<int> alloc; | ||
|
|
||
| <<<<<<< HEAD |
# Conflicts: # source/elements/oneTBB/source/containers/concurrent_bounded_queue_cls/deduction_guides.rst # source/elements/oneTBB/source/containers/concurrent_hash_map_cls.rst # source/elements/oneTBB/source/containers/concurrent_multiset_cls.rst # source/elements/oneTBB/source/containers/concurrent_priority_queue_cls/deduction_guides.rst # source/elements/oneTBB/source/containers/concurrent_queue_cls/deduction_guides.rst # source/elements/oneTBB/source/containers/concurrent_set_cls.rst # source/elements/oneTBB/source/containers/concurrent_vector_cls/deduction_guides.rst # source/elements/oneTBB/source/task_scheduler/task_arena/task_arena_cls.rst Signed-off-by: Anton Potapov <anton.potapov@intel.com>
- fixed header name Signed-off-by: Anton Potapov <anton.potapov@intel.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch replaces tbb namespaces and headers with oneapi tbb.
Signed-off-by: Alexandra Epanchinzeva alexandra.epanchinzeva@intel.com