Skip to content

[SYCL] Remove superfluous C++ linkage spec from assert headers #15614

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.

Sign up for GitHub

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 13 commits into from
Oct 8, 2024
Merged

[SYCL] Remove superfluous C++ linkage spec from assert headers #15614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e6388c6
Add C++ linkage specification to SYCL assert headers
lbushi25 Oct 1, 2024
3e80979
Add tests for assert headers linkage specifications
lbushi25 Oct 1, 2024
7b77170
Add tests for assert headers linkage specifications
lbushi25 Oct 1, 2024
73ce7a8
Merge the two tests into one
lbushi25 Oct 1, 2024
a9c030c
Update assert.h
lbushi25 Oct 2, 2024
ae60749
Update cassert
lbushi25 Oct 2, 2024
ad2bacc
Update assert_header_with_c_linkage.cpp
lbushi25 Oct 2, 2024
4868065
Update assert.h
lbushi25 Oct 2, 2024
7594952
Remove superfluous C++ linkage specification from cassert header
lbushi25 Oct 4, 2024
58fe4c5
Remove superfluous C++ linkage specification from cassert header
lbushi25 Oct 4, 2024
7996d84
Remove superfluous C++ linkage specification from assert headers
lbushi25 Oct 4, 2024
c7ae14a
Remove superfluous C++ linkage specification from cassert header
lbushi25 Oct 4, 2024
8250144
Update assert_header_with_c_linkage.cpp
lbushi25 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sycl/include/sycl/stl_wrappers/cassert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <../include/cassert>
#endif

extern "C++" {
#ifdef __SYCL_DEVICE_ONLY__
#include <CL/__spirv/spirv_vars.hpp>

Expand All @@ -43,4 +42,3 @@ __devicelib_assert_fail(const char *, const char *, int32_t, const char *,
#endif
#endif
#endif
}
9 changes: 2 additions & 7 deletions sycl/test/basic_tests/assert_header_with_c_linkage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
// RUN: %clangxx -fsycl -DASSERT -fsyntax-only %s
// RUN: %clangxx -fsycl -DCASSERT -fsyntax-only %s
// RUN: %clangxx -fsycl -fsyntax-only %s

// Verify that compilation works when assert.h/cassert is wrapped by a C linkage
// Verify that compilation works when assert.h is wrapped by a C linkage
// specification.

#ifdef __cplusplus
extern "C" {
#endif

#if defined(ASSERT)
#include <assert.h>
#elif defined(CASSERT)
#include <cassert>
#endif

#ifdef __cplusplus
}
Expand Down
Loading