Skip to content

Commit 9568e36

Browse files
authored
[SYCL][NFC] Remove __SYCL_INLINE_VER_NAMESPACE macro (#10510)
1 parent 8af94a0 commit 9568e36

File tree

412 files changed

+1050
-1056
lines changed

Some content is hidden

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

412 files changed

+1050
-1056
lines changed

clang/lib/Sema/SemaSYCL.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5184,7 +5184,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
51845184
O << "\n";
51855185

51865186
O << "namespace sycl {\n";
5187-
O << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n";
5187+
O << "inline namespace _V1 {\n";
51885188
O << "namespace detail {\n";
51895189

51905190
// Generate declaration of variable of type __sycl_device_global_registration
@@ -5347,7 +5347,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
53475347
}
53485348
O << "\n";
53495349
O << "} // namespace detail\n";
5350-
O << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n";
5350+
O << "} // namespace _V1\n";
53515351
O << "} // namespace sycl\n";
53525352
O << "\n";
53535353
}
@@ -5659,7 +5659,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
56595659
} else {
56605660
EmittedFirstSpecConstant = true;
56615661
OS << "namespace sycl {\n";
5662-
OS << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n";
5662+
OS << "inline namespace _V1 {\n";
56635663
OS << "namespace detail {\n";
56645664
OS << "template<>\n";
56655665
OS << "inline const char *get_spec_constant_symbolic_ID_impl<";
@@ -5677,7 +5677,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
56775677
OS << "\";\n";
56785678
OS << "}\n";
56795679
OS << "} // namespace detail\n";
5680-
OS << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n";
5680+
OS << "} // namespace _V1\n";
56815681
OS << "} // namespace sycl\n";
56825682
}
56835683
}

clang/test/CodeGenSYCL/Inputs/sycl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,5 +670,5 @@ class image {
670670
}
671671
};
672672

673-
} // inline namespace _V1
673+
} // namespace _V1
674674
} // namespace sycl

clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class __attribute__((sycl_special_class)) [[__sycl_detail__::sycl_type(accessor)
7171
range<dimensions> MemRange, id<dimensions> Offset) {}
7272
};
7373

74-
} // inline namespace _V1
74+
} // namespace _V1
7575
} // namespace sycl
7676

7777
template <typename name, typename Func>

0 commit comments

Comments
 (0)