merge

intel · Feb 27, 2024 · 6e18644 · 6e18644
1 parent b48f868
commit 6e18644
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp
@@ -193,9 +193,7 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
   /// The return type depends on information being queried.
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
   template <typename Param>
-  //typename detail::is_platform_info_desc<Param>::return_type get_info() const {
-  typename detail::ABINeutralT_t<
-    typename detail::is_platform_info_desc<Param>::return_type> get_info() const {
+  typename detail::is_platform_info_desc<Param>::return_type get_info() const {
     auto Info = get_info_impl<Param>();
     return detail::convert_from_abi_neutral(Info);
   }

diff --git a/sycl/source/platform.cpp b/sycl/source/platform.cpp
@@ -86,8 +86,8 @@ bool platform::has(aspect Aspect) const { return impl->has(Aspect); }
   platform::get_info_impl<info::platform::Desc>() const;
 #else
 #define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)              \
-  template __SYCL_EXPORT typename detail::ABINeutralT_t<ReturnT> \
-   platform::get_info<info::platform::Desc>()    const;
+  template __SYCL_EXPORT ReturnT platform::get_info<info::platform::Desc>()    \
+      const;
 #endif
 
 #include <sycl/info/platform_traits.def>