From 6e1864442928775e1ab127b2253f0875a905d493 Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Tue, 27 Feb 2024 15:49:35 -0800 Subject: [PATCH] merge --- sycl/include/sycl/platform.hpp | 4 +--- sycl/source/platform.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp index 1758874b711c2..9e449fd43dcca 100644 --- a/sycl/include/sycl/platform.hpp +++ b/sycl/include/sycl/platform.hpp @@ -193,9 +193,7 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase { /// The return type depends on information being queried. #ifdef __INTEL_PREVIEW_BREAKING_CHANGES template - //typename detail::is_platform_info_desc::return_type get_info() const { - typename detail::ABINeutralT_t< - typename detail::is_platform_info_desc::return_type> get_info() const { + typename detail::is_platform_info_desc::return_type get_info() const { auto Info = get_info_impl(); return detail::convert_from_abi_neutral(Info); } diff --git a/sycl/source/platform.cpp b/sycl/source/platform.cpp index 998b8a297bf0e..5a1838c684fda 100644 --- 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() const; #else #define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode) \ - template __SYCL_EXPORT typename detail::ABINeutralT_t \ - platform::get_info() const; + template __SYCL_EXPORT ReturnT platform::get_info() \ + const; #endif #include