Skip to content

[SYCL][NFC] Resolve variable name conflict with a macro #5513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 8, 2022

Conversation

HabKaffee
Copy link
Contributor

@HabKaffee HabKaffee commented Feb 8, 2022

This patch renames conflicted detail::code_location name from detail::code_location CL to detail::code_location codeLoc.
It fixes #5479

@HabKaffee HabKaffee requested a review from a team as a code owner February 8, 2022 15:13
@bader bader changed the title [SYCL][GitHub] Renamed conflicted variable definition in usm.hpp and usm/usm_allocator.hpp [SYCL] Resolve variable name conflict with a macro Feb 8, 2022
@@ -20,133 +20,133 @@ namespace sycl {
///
__SYCL_EXPORT void *malloc_device(
size_t size, const device &dev, const context &ctxt,
const detail::code_location CL = detail::code_location::current());
const detail::code_location codeLoc = detail::code_location::current());
Copy link
Contributor

Choose a reason for hiding this comment

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

To follow LLVM Style Guidelines

Suggested change
const detail::code_location codeLoc = detail::code_location::current());
const detail::code_location CodeLoc = detail::code_location::current());

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I'll change it.

@bader bader changed the title [SYCL] Resolve variable name conflict with a macro [SYCL][NFC] Resolve variable name conflict with a macro Feb 8, 2022
@bader bader merged commit 763d58e into intel:sycl Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Variable definition in usm.hpp conflicts with user macro
3 participants