Working draft

Author: maximdimakov

sycl/include/CL/sycl/handler.hpp

@@ -40,18 +40,17 @@
 #define __SYCL_NONCONST_FUNCTOR__
 #endif
 
-#ifdef SYCL_LANGUAGE_VERSION
-#define SYCL_STD_VERSION SYCL_LANGUAGE_VERSION
+#if SYCL_LANGUAGE_VERSION
+#define __SYCL_STD_VERSION__ SYCL_LANGUAGE_VERSION
 #else
-#define SYCL_STD_VERSION 201707
+#define __SYCL_STD_VERSION__ 201707
 #endif
 
 enum Sycl_std_versions {
   version_older_2020,
   version_2020
 };
-const Sycl_std_versions sycl_ver = 
-  SYCL_STD_VERSION < 202000 ? version_older_2020 : version_2020;
+extern Sycl_std_versions sycl_ver;
 
 template <typename DataT, int Dimensions, cl::sycl::access::mode AccessMode,
           cl::sycl::access::target AccessTarget,

sycl/source/handler.cpp

@@ -20,6 +20,8 @@
 #include <detail/queue_impl.hpp>
 #include <detail/scheduler/scheduler.hpp>
 
+Sycl_std_versions sycl_ver;
+
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {