Skip to content

Conversation

@aepanchi
Copy link
Contributor

This patch replaces tbb namespaces and headers with oneapi tbb.

Signed-off-by: Alexandra Epanchinzeva [email protected]

const col_range_type& cols() const;
};
}
namespace oneapi{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space is missed before {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
namespace oneapi{
namespace oneapi {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

// Defined in header <oneapi/tbb/flow_graph.h>
namespace oneapi {
namespace tbb {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, some have indentation and some haven't. Let's choose one way, and I will fix it

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed internally and decided to go as-is with this patch and fix indentation later.

Copy link
Contributor

@anton-potapov anton-potapov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update dates in the license header of affected files

Copy link
Contributor

@anton-potapov anton-potapov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the PR to the latest main branch (in order to resolve to conflicts)

std::allocator<int> alloc;
<<<<<<< HEAD

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incorrectly merged

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

# 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 <[email protected]>
 - fixed header name

Signed-off-by: Anton Potapov <[email protected]>
@anton-potapov anton-potapov merged commit 247ef9c into uxlfoundation:main Sep 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants