[SYCL] Return support for compilation with C++14 back (intel#3802)

Author: romanovvlad

sycl/include/CL/sycl/detail/defines_elementary.hpp

@@ -40,11 +40,7 @@
 
 #ifndef __SYCL_DEPRECATED
 #ifndef SYCL_DISABLE_DEPRECATION_WARNINGS
-#ifdef _WIN32
-#define __SYCL_DEPRECATED(message) __declspec(deprecated(message))
-#else
-#define __SYCL_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
+#define __SYCL_DEPRECATED(message) [[deprecated(message)]]
 #else // SYCL_DISABLE_DEPRECATION_WARNINGS
 #define __SYCL_DEPRECATED(message)
 #endif // SYCL_DISABLE_DEPRECATION_WARNINGS

sycl/include/CL/sycl/kernel.hpp

@@ -153,8 +153,8 @@ class __SYCL_EXPORT kernel {
   /// \return depends on information being queried.
   template <info::kernel_sub_group param>
   // clang-format off
-  typename info::param_traits<info::kernel_sub_group, param>::return_type
   __SYCL_DEPRECATED("Use get_info with info::kernel_device_specific instead.")
+  typename info::param_traits<info::kernel_sub_group, param>::return_type
   get_sub_group_info(const device &Device) const;
   // clang-format on
 
@@ -166,8 +166,8 @@ class __SYCL_EXPORT kernel {
   /// \return depends on information being queried.
   template <info::kernel_sub_group param>
   // clang-format off
-  typename info::param_traits<info::kernel_sub_group, param>::return_type
   __SYCL_DEPRECATED("Use get_info with info::kernel_device_specific instead.")
+  typename info::param_traits<info::kernel_sub_group, param>::return_type
   get_sub_group_info(const device &Device,
                      typename info::param_traits<info::kernel_sub_group,
                      param>::input_type Value) const;

sycl/include/CL/sycl/kernel_handler.hpp

@@ -43,6 +43,7 @@ class kernel_handler {
   }
 
 #ifdef __SYCL_DEVICE_ONLY__
+#if __cplusplus >= 201703L
   template <
       auto &S,
       typename T = typename std::remove_reference_t<decltype(S)>::value_type,
@@ -63,6 +64,7 @@ class kernel_handler {
     return __sycl_getComposite2020SpecConstantValue<T>(
         SymbolicID, &S, MSpecializationConstantsBuffer);
   }
+#endif // __cplusplus >= 201703L
 #endif // __SYCL_DEVICE_ONLY__
 
   char *MSpecializationConstantsBuffer = nullptr;

sycl/include/CL/sycl/properties/accessor_properties.hpp

@@ -28,8 +28,8 @@ class __SYCL2020_DEPRECATED("spelling is now: no_init") noinit
 
 __SYCL_INLINE_CONSTEXPR property::no_init no_init;
 
-__SYCL_INLINE_CONSTEXPR property::noinit
-    __SYCL2020_DEPRECATED("spelling is now: no_init") noinit;
+__SYCL2020_DEPRECATED("spelling is now: no_init")
+__SYCL_INLINE_CONSTEXPR property::noinit noinit;
 
 #else
 

sycl/include/CL/sycl/sycl_span.hpp

@@ -7,6 +7,8 @@
 //
 //===---------------------------------------------------------------------===//
 
+#if __cplusplus >= 201703L
+
 #ifndef _SYCL_SPAN
 #define _SYCL_SPAN
 
@@ -623,3 +625,5 @@ span(const _Container &)->span<const typename _Container::value_type>;
 } // __SYCL_INLINE_NAMESPACE(cl)
 
 #endif // _SYCL_SPAN
+
+#endif // __cplusplus >= 201703L

sycl/test/basic_tests/stdcpp_compat.cpp

@@ -1,4 +1,5 @@
 // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -c -o %t.out
+// RUN: %clangxx -fsycl -std=c++14 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -c -o %t.out
 // RUN: %clangxx -fsycl -std=c++17 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -c -o %t.out
 // RUN: %clangxx -fsycl -std=c++20 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -c -o %t.out
 // expected-no-diagnostics

sycl/unittests/get_native_interop/test_get_native.cpp

@@ -8,6 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define SYCL2020_DISABLE_DEPRECATION_WARNINGS
+
 #include <CL/sycl.hpp>
 #include <CL/sycl/backend/opencl.hpp>
 #include <detail/context_impl.hpp>