<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;">
<div>
<div dir="ltr" id="divtagdefaultwrapper" style="color:black;font-size:12pt;font-family:Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols;">
<p style="margin-top:0;margin-bottom:0;">Hi Hans,</p>
<p style="margin-top:0;margin-bottom:0;"><br>
</p>
<p style="margin-top:0;margin-bottom:0;">Can this be merged into the release 9.0 branch please?<br>
</p>
</div>
<div dir="ltr" style="color:black;font-size:12pt;font-family:Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols;">
<br>
</div>
<div dir="ltr" style="color:black;font-size:12pt;font-family:Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols;">
Thank you!</div>
Anastasia</div>
<br>
<br>
<div dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif,"EmojiFont","Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols">
<div style="color:rgb(0,0,0)">
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> cfe-commits <cfe-commits-bounces@lists.llvm.org> on behalf of Anastasia Stulova via cfe-commits <cfe-commits@lists.llvm.org><br>
<b>Sent:</b> 12 August 2019 11:44<br>
<b>To:</b> cfe-commits@lists.llvm.org <cfe-commits@lists.llvm.org><br>
<b>Subject:</b> r368552 - [OpenCL] Fix lang mode predefined macros for C++ mode.</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt">
<div class="PlainText">Author: stulova<br>
Date: Mon Aug 12 03:44:07 2019<br>
New Revision: 368552<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=368552&view=rev">http://llvm.org/viewvc/llvm-project?rev=368552&view=rev</a><br>
Log:<br>
[OpenCL] Fix lang mode predefined macros for C++ mode.<br>
<br>
In C++ mode we should only avoid adding __OPENCL_C_VERSION__,<br>
all other predefined macros about the language mode are still<br>
valid.<br>
<br>
This change also fixes the language version check in the<br>
headers accordingly.<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D65941">https://reviews.llvm.org/D65941</a><br>
<br>
<br>
Modified:<br>
    cfe/trunk/lib/Frontend/InitPreprocessor.cpp<br>
    cfe/trunk/lib/Headers/opencl-c-base.h<br>
    cfe/trunk/lib/Headers/opencl-c.h<br>
<br>
Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=368552&r1=368551&r2=368552&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=368552&r1=368551&r2=368552&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Mon Aug 12 03:44:07 2019<br>
@@ -437,17 +437,17 @@ static void InitializeStandardPredefined<br>
       default:<br>
         llvm_unreachable("Unsupported OpenCL version");<br>
       }<br>
-      Builder.defineMacro("CL_VERSION_1_0", "100");<br>
-      Builder.defineMacro("CL_VERSION_1_1", "110");<br>
-      Builder.defineMacro("CL_VERSION_1_2", "120");<br>
-      Builder.defineMacro("CL_VERSION_2_0", "200");<br>
+    }<br>
+    Builder.defineMacro("CL_VERSION_1_0", "100");<br>
+    Builder.defineMacro("CL_VERSION_1_1", "110");<br>
+    Builder.defineMacro("CL_VERSION_1_2", "120");<br>
+    Builder.defineMacro("CL_VERSION_2_0", "200");<br>
 <br>
-      if (TI.isLittleEndian())<br>
-        Builder.defineMacro("__ENDIAN_LITTLE__");<br>
+    if (TI.isLittleEndian())<br>
+      Builder.defineMacro("__ENDIAN_LITTLE__");<br>
 <br>
-      if (LangOpts.FastRelaxedMath)<br>
-        Builder.defineMacro("__FAST_RELAXED_MATH__");<br>
-    }<br>
+    if (LangOpts.FastRelaxedMath)<br>
+      Builder.defineMacro("__FAST_RELAXED_MATH__");<br>
   }<br>
   // Not "standard" per se, but available even with the -undef flag.<br>
   if (LangOpts.AsmPreprocessor)<br>
<br>
Modified: cfe/trunk/lib/Headers/opencl-c-base.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c-base.h?rev=368552&r1=368551&r2=368552&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c-base.h?rev=368552&r1=368551&r2=368552&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/opencl-c-base.h (original)<br>
+++ cfe/trunk/lib/Headers/opencl-c-base.h Mon Aug 12 03:44:07 2019<br>
@@ -126,7 +126,7 @@ typedef double double8 __attribute__((ex<br>
 typedef double double16 __attribute__((ext_vector_type(16)));<br>
 #endif<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #define NULL ((void*)0)<br>
 #endif<br>
 <br>
@@ -276,7 +276,7 @@ typedef uint cl_mem_fence_flags;<br>
  */<br>
 #define CLK_GLOBAL_MEM_FENCE   0x02<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 typedef enum memory_scope {<br>
   memory_scope_work_item = __OPENCL_MEMORY_SCOPE_WORK_ITEM,<br>
@@ -288,9 +288,6 @@ typedef enum memory_scope {<br>
 #endif<br>
 } memory_scope;<br>
 <br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
-<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
 /**<br>
  * Queue a memory fence to ensure correct ordering of memory<br>
  * operations between work-items of a work-group to<br>
@@ -313,7 +310,7 @@ typedef enum memory_order<br>
   memory_order_seq_cst = __ATOMIC_SEQ_CST<br>
 } memory_order;<br>
 <br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v1.1 s6.11.3, v1.2 s6.12.14, v2.0 s6.13.14 - Image Read and Write Functions<br>
 <br>
@@ -389,14 +386,10 @@ typedef enum memory_order<br>
 #endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
 <br>
 // OpenCL v2.0 s6.13.16 - Pipe Functions<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #define CLK_NULL_RESERVE_ID (__builtin_astype(((void*)(__SIZE_MAX__)), reserve_id_t))<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
-<br>
 <br>
 // OpenCL v2.0 s6.13.17 - Enqueue Kernels<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
-<br>
 #define CL_COMPLETE                                 0x0<br>
 #define CL_RUNNING                                  0x1<br>
 #define CL_SUBMITTED                                0x2<br>
@@ -435,7 +428,7 @@ typedef struct {<br>
   size_t localWorkSize[MAX_WORK_DIM];<br>
 } ndrange_t;<br>
 <br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 #ifdef cl_intel_device_side_avc_motion_estimation<br>
 #pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : begin<br>
<br>
Modified: cfe/trunk/lib/Headers/opencl-c.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c.h?rev=368552&r1=368551&r2=368552&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c.h?rev=368552&r1=368551&r2=368552&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/opencl-c.h (original)<br>
+++ cfe/trunk/lib/Headers/opencl-c.h Mon Aug 12 03:44:07 2019<br>
@@ -11,11 +11,11 @@<br>
 <br>
 #include "opencl-c-base.h"<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #ifndef cl_khr_depth_images<br>
 #define cl_khr_depth_images<br>
 #endif //cl_khr_depth_images<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 #if __OPENCL_C_VERSION__ < CL_VERSION_2_0<br>
 #ifdef cl_khr_3d_image_writes<br>
@@ -23,10 +23,10 @@<br>
 #endif //cl_khr_3d_image_writes<br>
 #endif //__OPENCL_C_VERSION__ < CL_VERSION_2_0<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 #pragma OPENCL EXTENSION cl_intel_planar_yuv : begin<br>
 #pragma OPENCL EXTENSION cl_intel_planar_yuv : end<br>
-#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 <br>
 #define __ovld __attribute__((overloadable))<br>
 #define __conv __attribute__((convergent))<br>
@@ -6517,11 +6517,11 @@ size_t __ovld __cnfn get_group_id(uint d<br>
  */<br>
 size_t __ovld __cnfn get_global_offset(uint dimindx);<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 size_t __ovld get_enqueued_local_size(uint dimindx);<br>
 size_t __ovld get_global_linear_id(void);<br>
 size_t __ovld get_local_linear_id(void);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v1.1 s6.11.2, v1.2 s6.12.2, v2.0 s6.13.2 - Math functions<br>
 <br>
@@ -7352,7 +7352,7 @@ half16 __ovld __cnfn fmod(half16 x, half<br>
  * Returns fmin(x - floor (x), 0x1.fffffep-1f ).<br>
  * floor(x) is returned in iptr.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld fract(float x, float *iptr);<br>
 float2 __ovld fract(float2 x, float2 *iptr);<br>
 float3 __ovld fract(float3 x, float3 *iptr);<br>
@@ -7434,7 +7434,7 @@ half4 __ovld fract(half4 x, __private ha<br>
 half8 __ovld fract(half8 x, __private half8 *iptr);<br>
 half16 __ovld fract(half16 x, __private half16 *iptr);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Extract mantissa and exponent from x. For each<br>
@@ -7442,7 +7442,7 @@ half16 __ovld fract(half16 x, __private<br>
  * magnitude in the interval [1/2, 1) or 0. Each<br>
  * component of x equals mantissa returned * 2^exp.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld frexp(float x, int *exp);<br>
 float2 __ovld frexp(float2 x, int2 *exp);<br>
 float3 __ovld frexp(float3 x, int3 *exp);<br>
@@ -7524,7 +7524,7 @@ half4 __ovld frexp(half4 x, __private in<br>
 half8 __ovld frexp(half8 x, __private int8 *exp);<br>
 half16 __ovld frexp(half16 x, __private int16 *exp);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Compute the value of the square root of x^2 + y^2<br>
@@ -7649,7 +7649,7 @@ half8 __ovld __cnfn lgamma(half8 x);<br>
 half16 __ovld __cnfn lgamma(half16 x);<br>
 #endif //cl_khr_fp16<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld lgamma_r(float x, int *signp);<br>
 float2 __ovld lgamma_r(float2 x, int2 *signp);<br>
 float3 __ovld lgamma_r(float3 x, int3 *signp);<br>
@@ -7731,7 +7731,7 @@ half4 __ovld lgamma_r(half4 x, __private<br>
 half8 __ovld lgamma_r(half8 x, __private int8 *signp);<br>
 half16 __ovld lgamma_r(half16 x, __private int16 *signp);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Compute natural logarithm.<br>
@@ -7955,7 +7955,7 @@ half16 __ovld __cnfn minmag(half16 x, ha<br>
  * the argument. It stores the integral part in the object<br>
  * pointed to by iptr.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld modf(float x, float *iptr);<br>
 float2 __ovld modf(float2 x, float2 *iptr);<br>
 float3 __ovld modf(float3 x, float3 *iptr);<br>
@@ -8037,7 +8037,7 @@ half4 __ovld modf(half4 x, __private hal<br>
 half8 __ovld modf(half8 x, __private half8 *iptr);<br>
 half16 __ovld modf(half16 x, __private half16 *iptr);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Returns a quiet NaN. The nancode may be placed<br>
@@ -8215,7 +8215,7 @@ half16 __ovld __cnfn remainder(half16 x,<br>
  * sign as x/y. It stores this signed value in the object<br>
  * pointed to by quo.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld remquo(float x, float y, int *quo);<br>
 float2 __ovld remquo(float2 x, float2 y, int2 *quo);<br>
 float3 __ovld remquo(float3 x, float3 y, int3 *quo);<br>
@@ -8298,7 +8298,7 @@ half4 __ovld remquo(half4 x, half4 y, __<br>
 half8 __ovld remquo(half8 x, half8 y, __private int8 *quo);<br>
 half16 __ovld remquo(half16 x, half16 y, __private int16 *quo);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 /**<br>
  * Round to integral value (using round to nearest<br>
  * even rounding mode) in floating-point format.<br>
@@ -8439,7 +8439,7 @@ half16 __ovld __cnfn sin(half16);<br>
  * is the return value and computed cosine is returned<br>
  * in cosval.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld sincos(float x, float *cosval);<br>
 float2 __ovld sincos(float2 x, float2 *cosval);<br>
 float3 __ovld sincos(float3 x, float3 *cosval);<br>
@@ -8521,7 +8521,7 @@ half4 __ovld sincos(half4 x, __private h<br>
 half8 __ovld sincos(half8 x, __private half8 *cosval);<br>
 half16 __ovld sincos(half16 x, __private half16 *cosval);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Compute hyperbolic sine.<br>
@@ -9446,7 +9446,7 @@ ulong16 __ovld __cnfn clz(ulong16 x);<br>
  * returns the size in bits of the type of x or<br>
  * component type of x, if x is a vector.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 char __ovld ctz(char x);<br>
 uchar __ovld ctz(uchar x);<br>
 char2 __ovld ctz(char2 x);<br>
@@ -9495,7 +9495,7 @@ long8 __ovld ctz(long8 x);<br>
 ulong8 __ovld ctz(ulong8 x);<br>
 long16 __ovld ctz(long16 x);<br>
 ulong16 __ovld ctz(ulong16 x);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Returns mul_hi(a, b) + c.<br>
@@ -11340,7 +11340,7 @@ half8 __ovld vload8(size_t offset, const<br>
 half16 __ovld vload16(size_t offset, const __constant half *p);<br>
 #endif //cl_khr_fp16<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 char2 __ovld vload2(size_t offset, const char *p);<br>
 uchar2 __ovld vload2(size_t offset, const uchar *p);<br>
 short2 __ovld vload2(size_t offset, const short *p);<br>
@@ -11578,9 +11578,9 @@ half4 __ovld vload4(size_t offset, const<br>
 half8 __ovld vload8(size_t offset, const __private half *p);<br>
 half16 __ovld vload16(size_t offset, const __private half *p);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void __ovld vstore2(char2 data, size_t offset, char *p);<br>
 void __ovld vstore2(uchar2 data, size_t offset, uchar *p);<br>
 void __ovld vstore2(short2 data, size_t offset, short *p);<br>
@@ -11814,7 +11814,7 @@ void __ovld vstore4(half4 data, size_t o<br>
 void __ovld vstore8(half8 data, size_t offset, __private half *p);<br>
 void __ovld vstore16(half16 data, size_t offset, __private half *p);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Read sizeof (half) bytes of data from address<br>
@@ -11825,13 +11825,13 @@ void __ovld vstore16(half16 data, size_t<br>
  * must be 16-bit aligned.<br>
  */<br>
 float __ovld vload_half(size_t offset, const __constant half *p);<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld vload_half(size_t offset, const half *p);<br>
 #else<br>
 float __ovld vload_half(size_t offset, const __global half *p);<br>
 float __ovld vload_half(size_t offset, const __local half *p);<br>
 float __ovld vload_half(size_t offset, const __private half *p);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Read sizeof (halfn) bytes of data from address<br>
@@ -11846,7 +11846,7 @@ float3 __ovld vload_half3(size_t offset,<br>
 float4 __ovld vload_half4(size_t offset, const __constant half *p);<br>
 float8 __ovld vload_half8(size_t offset, const __constant half *p);<br>
 float16 __ovld vload_half16(size_t offset, const __constant half *p);<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float2 __ovld vload_half2(size_t offset, const half *p);<br>
 float3 __ovld vload_half3(size_t offset, const half *p);<br>
 float4 __ovld vload_half4(size_t offset, const half *p);<br>
@@ -11868,7 +11868,7 @@ float3 __ovld vload_half3(size_t offset,<br>
 float4 __ovld vload_half4(size_t offset, const __private half *p);<br>
 float8 __ovld vload_half8(size_t offset, const __private half *p);<br>
 float16 __ovld vload_half16(size_t offset, const __private half *p);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * The float value given by data is first<br>
@@ -11881,7 +11881,7 @@ float16 __ovld vload_half16(size_t offse<br>
  * The default current rounding mode is round to<br>
  * nearest even.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void __ovld vstore_half(float data, size_t offset, half *p);<br>
 void __ovld vstore_half_rte(float data, size_t offset, half *p);<br>
 void __ovld vstore_half_rtz(float data, size_t offset, half *p);<br>
@@ -11927,7 +11927,7 @@ void __ovld vstore_half_rtz(double data,<br>
 void __ovld vstore_half_rtp(double data, size_t offset, __private half *p);<br>
 void __ovld vstore_half_rtn(double data, size_t offset, __private half *p);<br>
 #endif //cl_khr_fp64<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * The floatn value given by data is converted to<br>
@@ -11940,7 +11940,7 @@ void __ovld vstore_half_rtn(double data,<br>
  * The default current rounding mode is round to<br>
  * nearest even.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void __ovld vstore_half2(float2 data, size_t offset, half *p);<br>
 void __ovld vstore_half3(float3 data, size_t offset, half *p);<br>
 void __ovld vstore_half4(float4 data, size_t offset, half *p);<br>
@@ -12146,7 +12146,7 @@ void __ovld vstore_half4_rtn(double4 dat<br>
 void __ovld vstore_half8_rtn(double8 data, size_t offset, __private half *p);<br>
 void __ovld vstore_half16_rtn(double16 data, size_t offset, __private half *p);<br>
 #endif //cl_khr_fp64<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * For n = 1, 2, 4, 8 and 16 read sizeof (halfn)<br>
@@ -12167,7 +12167,7 @@ float3 __ovld vloada_half3(size_t offset<br>
 float4 __ovld vloada_half4(size_t offset, const __constant half *p);<br>
 float8 __ovld vloada_half8(size_t offset, const __constant half *p);<br>
 float16 __ovld vloada_half16(size_t offset, const __constant half *p);<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float __ovld vloada_half(size_t offset, const half *p);<br>
 float2 __ovld vloada_half2(size_t offset, const half *p);<br>
 float3 __ovld vloada_half3(size_t offset, const half *p);<br>
@@ -12193,7 +12193,7 @@ float3 __ovld vloada_half3(size_t offset<br>
 float4 __ovld vloada_half4(size_t offset, const __private half *p);<br>
 float8 __ovld vloada_half8(size_t offset, const __private half *p);<br>
 float16 __ovld vloada_half16(size_t offset, const __private half *p);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * The floatn value given by data is converted to<br>
@@ -12211,7 +12211,7 @@ float16 __ovld vloada_half16(size_t offs<br>
  * mode. The default current rounding mode is<br>
  * round to nearest even.<br>
  */<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void __ovld vstorea_half(float data, size_t offset, half *p);<br>
 void __ovld vstorea_half2(float2 data, size_t offset, half *p);<br>
 void __ovld vstorea_half3(float3 data, size_t offset, half *p);<br>
@@ -12496,7 +12496,7 @@ void __ovld vstorea_half4_rtn(double4 da<br>
 void __ovld vstorea_half8_rtn(double8 data,size_t offset, __private half *p);<br>
 void __ovld vstorea_half16_rtn(double16 data,size_t offset, __private half *p);<br>
 #endif //cl_khr_fp64<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v1.1 s6.11.8, v1.2 s6.12.8, v2.0 s6.13.8 - Synchronization Functions<br>
 <br>
@@ -12532,10 +12532,10 @@ void __ovld vstorea_half16_rtn(double16<br>
 <br>
 void __ovld __conv barrier(cl_mem_fence_flags flags);<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void __ovld __conv work_group_barrier(cl_mem_fence_flags flags, memory_scope scope);<br>
 void __ovld __conv work_group_barrier(cl_mem_fence_flags flags);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v1.1 s6.11.9, v1.2 s6.12.9 - Explicit Memory Fence Functions<br>
 <br>
@@ -12580,7 +12580,7 @@ void __ovld write_mem_fence(cl_mem_fence<br>
 <br>
 // OpenCL v2.0 s6.13.9 - Address Space Qualifier Functions<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 cl_mem_fence_flags __ovld get_fence(const void *ptr);<br>
 cl_mem_fence_flags __ovld get_fence(void *ptr);<br>
 <br>
@@ -12591,7 +12591,7 @@ cl_mem_fence_flags __ovld get_fence(void<br>
  * where gentype is builtin type or user defined type.<br>
  */<br>
 <br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v1.1 s6.11.10, v1.2 s6.12.10, v2.0 s6.13.10 - Async Copies from Global to Local Memory, Local to Global Memory, and Prefetch<br>
 <br>
@@ -13371,7 +13371,7 @@ unsigned long __ovld atom_xor(volatile _<br>
 <br>
 // OpenCL v2.0 s6.13.11 - Atomics Functions<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // double atomics support requires extensions cl_khr_int64_base_atomics and cl_khr_int64_extended_atomics<br>
 #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)<br>
@@ -13692,7 +13692,7 @@ void __ovld atomic_flag_clear(volatile a<br>
 void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, memory_order order);<br>
 void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, memory_order order, memory_scope scope);<br>
 <br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v1.1 s6.11.12, v1.2 s6.12.12, v2.0 s6.13.12 - Miscellaneous Vector Functions<br>
 <br>
@@ -14186,7 +14186,7 @@ half16 __ovld __cnfn shuffle2(half8 x, h<br>
 half16 __ovld __cnfn shuffle2(half16 x, half16 y, ushort16 mask);<br>
 #endif //cl_khr_fp16<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 // OpenCL v1.2 s6.12.13, v2.0 s6.13.13 - printf<br>
 <br>
 int printf(__constant const char* st, ...) __attribute__((format(printf, 1, 2)));<br>
@@ -14307,7 +14307,7 @@ int4 __purefn __ovld read_imagei(read_on<br>
 uint4 __purefn __ovld read_imageui(read_only image3d_t image, sampler_t sampler, int4 coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image3d_t image, sampler_t sampler, float4 coord);<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 float4 __purefn __ovld read_imagef(read_only image2d_array_t image_array, sampler_t sampler, int4 coord);<br>
 float4 __purefn __ovld read_imagef(read_only image2d_array_t image_array, sampler_t sampler, float4 coord);<br>
 <br>
@@ -14315,7 +14315,7 @@ int4 __purefn __ovld read_imagei(read_on<br>
 int4 __purefn __ovld read_imagei(read_only image2d_array_t image_array, sampler_t sampler, float4 coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image2d_array_t image_array, sampler_t sampler, int4 coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image2d_array_t image_array, sampler_t sampler, float4 coord);<br>
-#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 <br>
 float4 __purefn __ovld read_imagef(read_only image1d_t image, sampler_t sampler, int coord);<br>
 float4 __purefn __ovld read_imagef(read_only image1d_t image, sampler_t sampler, float coord);<br>
@@ -14325,7 +14325,7 @@ int4 __purefn __ovld read_imagei(read_on<br>
 uint4 __purefn __ovld read_imageui(read_only image1d_t image, sampler_t sampler, int coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image1d_t image, sampler_t sampler, float coord);<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 float4 __purefn __ovld read_imagef(read_only image1d_array_t image_array, sampler_t sampler, int2 coord);<br>
 float4 __purefn __ovld read_imagef(read_only image1d_array_t image_array, sampler_t sampler, float2 coord);<br>
 <br>
@@ -14333,7 +14333,7 @@ int4 __purefn __ovld read_imagei(read_on<br>
 int4 __purefn __ovld read_imagei(read_only image1d_array_t image_array, sampler_t sampler, float2 coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image1d_array_t image_array, sampler_t sampler, int2 coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image1d_array_t image_array, sampler_t sampler, float2 coord);<br>
-#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 <br>
 #ifdef cl_khr_depth_images<br>
 float __purefn __ovld read_imagef(read_only image2d_depth_t image, sampler_t sampler, float2 coord);<br>
@@ -14358,7 +14358,7 @@ float __purefn __ovld read_imagef(read_o<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
 // OpenCL Extension v2.0 s9.18 - Mipmaps<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #ifdef cl_khr_mipmap_image<br>
 <br>
 float4 __purefn __ovld read_imagef(read_only image1d_t image, sampler_t sampler, float coord, float lod);<br>
@@ -14410,9 +14410,9 @@ int4 __purefn __ovld read_imagei(read_on<br>
 uint4 __purefn __ovld read_imageui(read_only image3d_t image, sampler_t sampler, float4 coord, float4 gradientX, float4 gradientY);<br>
 <br>
 #endif //cl_khr_mipmap_image<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 <br>
 /**<br>
 * Sampler-less Image Access<br>
@@ -14447,7 +14447,7 @@ float4 __purefn __ovld read_imagef(read_<br>
 int4 __purefn __ovld read_imagei(read_only image3d_t image, int4 coord);<br>
 uint4 __purefn __ovld read_imageui(read_only image3d_t image, int4 coord);<br>
 <br>
-#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 <br>
 // Image read functions returning half4 type<br>
 #ifdef cl_khr_fp16<br>
@@ -14457,7 +14457,7 @@ half4 __purefn __ovld read_imageh(read_o<br>
 half4 __purefn __ovld read_imageh(read_only image2d_t image, sampler_t sampler, float2 coord);<br>
 half4 __purefn __ovld read_imageh(read_only image3d_t image, sampler_t sampler, int4 coord);<br>
 half4 __purefn __ovld read_imageh(read_only image3d_t image, sampler_t sampler, float4 coord);<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 half4 __purefn __ovld read_imageh(read_only image1d_array_t image, sampler_t sampler, int2 coord);<br>
 half4 __purefn __ovld read_imageh(read_only image1d_array_t image, sampler_t sampler, float2 coord);<br>
 half4 __purefn __ovld read_imageh(read_only image2d_array_t image, sampler_t sampler, int4 coord);<br>
@@ -14471,11 +14471,11 @@ half4 __purefn __ovld read_imageh(read_o<br>
 half4 __purefn __ovld read_imageh(read_only image1d_array_t image, int2 coord);<br>
 half4 __purefn __ovld read_imageh(read_only image2d_array_t image, int4 coord);<br>
 half4 __purefn __ovld read_imageh(read_only image1d_buffer_t image, int coord);<br>
-#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2)<br>
 #endif //cl_khr_fp16<br>
 <br>
 // Image read functions for read_write images<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 float4 __purefn __ovld read_imagef(read_write image1d_t image, int coord);<br>
 int4 __purefn __ovld read_imagei(read_write image1d_t image, int coord);<br>
 uint4 __purefn __ovld read_imageui(read_write image1d_t image, int coord);<br>
@@ -14518,7 +14518,7 @@ float __purefn __ovld read_imagef(read_w<br>
 float __purefn __ovld read_imagef(read_write image2d_array_msaa_depth_t image, int4 coord, int sample);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #ifdef cl_khr_mipmap_image<br>
 float4 __purefn __ovld read_imagef(read_write image1d_t image, sampler_t sampler, float coord, float lod);<br>
 int4 __purefn __ovld read_imagei(read_write image1d_t image, sampler_t sampler, float coord, float lod);<br>
@@ -14569,7 +14569,7 @@ int4 __purefn __ovld read_imagei(read_wr<br>
 uint4 __purefn __ovld read_imageui(read_write image3d_t image, sampler_t sampler, float4 coord, float4 gradientX, float4 gradientY);<br>
 <br>
 #endif //cl_khr_mipmap_image<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // Image read functions returning half4 type<br>
 #ifdef cl_khr_fp16<br>
@@ -14580,7 +14580,7 @@ half4 __purefn __ovld read_imageh(read_w<br>
 half4 __purefn __ovld read_imageh(read_write image2d_array_t image, int4 coord);<br>
 half4 __purefn __ovld read_imageh(read_write image1d_buffer_t image, int coord);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Write color value to location specified by coordinate<br>
@@ -14681,7 +14681,7 @@ void __ovld write_imagef(write_only imag<br>
 #endif //cl_khr_depth_images<br>
 <br>
 // OpenCL Extension v2.0 s9.18 - Mipmaps<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #ifdef cl_khr_mipmap_image<br>
 void __ovld write_imagef(write_only image1d_t image, int coord, int lod, float4 color);<br>
 void __ovld write_imagei(write_only image1d_t image, int coord, int lod, int4 color);<br>
@@ -14708,7 +14708,7 @@ void __ovld write_imagei(write_only imag<br>
 void __ovld write_imageui(write_only image3d_t image, int4 coord, int lod, uint4 color);<br>
 #endif<br>
 #endif //cl_khr_mipmap_image<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // Image write functions for half4 type<br>
 #ifdef cl_khr_fp16<br>
@@ -14723,7 +14723,7 @@ void __ovld write_imageh(write_only imag<br>
 #endif //cl_khr_fp16<br>
 <br>
 // Image write functions for read_write images<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void __ovld write_imagef(read_write image2d_t image, int2 coord, float4 color);<br>
 void __ovld write_imagei(read_write image2d_t image, int2 coord, int4 color);<br>
 void __ovld write_imageui(read_write image2d_t image, int2 coord, uint4 color);<br>
@@ -14755,7 +14755,7 @@ void __ovld write_imagef(read_write imag<br>
 void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, float color);<br>
 #endif //cl_khr_depth_images<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #ifdef cl_khr_mipmap_image<br>
 void __ovld write_imagef(read_write image1d_t image, int coord, int lod, float4 color);<br>
 void __ovld write_imagei(read_write image1d_t image, int coord, int lod, int4 color);<br>
@@ -14782,7 +14782,7 @@ void __ovld write_imagei(read_write imag<br>
 void __ovld write_imageui(read_write image3d_t image, int4 coord, int lod, uint4 color);<br>
 #endif<br>
 #endif //cl_khr_mipmap_image<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // Image write functions for half4 type<br>
 #ifdef cl_khr_fp16<br>
@@ -14795,7 +14795,7 @@ void __ovld write_imageh(read_write imag<br>
 void __ovld write_imageh(read_write image2d_array_t image, int4 coord, half4 color);<br>
 void __ovld write_imageh(read_write image1d_buffer_t image, int coord, half4 color);<br>
 #endif //cl_khr_fp16<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // Note: In OpenCL v1.0/1.1/1.2, image argument of image query builtin functions does not have<br>
 // access qualifier, which by default assume read_only access qualifier. Image query builtin<br>
@@ -14843,7 +14843,7 @@ int __ovld __cnfn get_image_width(write_<br>
 int __ovld __cnfn get_image_width(write_only image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld __cnfn get_image_width(read_write image1d_t image);<br>
 int __ovld __cnfn get_image_width(read_write image1d_buffer_t image);<br>
 int __ovld __cnfn get_image_width(read_write image2d_t image);<br>
@@ -14860,7 +14860,7 @@ int __ovld __cnfn get_image_width(read_w<br>
 int __ovld __cnfn get_image_width(read_write image2d_array_msaa_t image);<br>
 int __ovld __cnfn get_image_width(read_write image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the image height in pixels.<br>
@@ -14895,7 +14895,7 @@ int __ovld __cnfn get_image_height(write<br>
 int __ovld __cnfn get_image_height(write_only image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld __cnfn get_image_height(read_write image2d_t image);<br>
 int __ovld __cnfn get_image_height(read_write image3d_t image);<br>
 int __ovld __cnfn get_image_height(read_write image2d_array_t image);<br>
@@ -14909,7 +14909,7 @@ int __ovld __cnfn get_image_height(read_<br>
 int __ovld __cnfn get_image_height(read_write image2d_array_msaa_t image);<br>
 int __ovld __cnfn get_image_height(read_write image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the image depth in pixels.<br>
@@ -14920,12 +14920,12 @@ int __ovld __cnfn get_image_depth(read_o<br>
 int __ovld __cnfn get_image_depth(write_only image3d_t image);<br>
 #endif<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld __cnfn get_image_depth(read_write image3d_t image);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL Extension v2.0 s9.18 - Mipmaps<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #ifdef cl_khr_mipmap_image<br>
 /**<br>
  * Return the image miplevels.<br>
@@ -14961,7 +14961,7 @@ int __ovld get_image_num_mip_levels(read<br>
 int __ovld get_image_num_mip_levels(read_write image2d_depth_t image);<br>
 <br>
 #endif //cl_khr_mipmap_image<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the channel data type. Valid values are:<br>
@@ -15018,7 +15018,7 @@ int __ovld __cnfn get_image_channel_data<br>
 int __ovld __cnfn get_image_channel_data_type(write_only image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld __cnfn get_image_channel_data_type(read_write image1d_t image);<br>
 int __ovld __cnfn get_image_channel_data_type(read_write image1d_buffer_t image);<br>
 int __ovld __cnfn get_image_channel_data_type(read_write image2d_t image);<br>
@@ -15035,7 +15035,7 @@ int __ovld __cnfn get_image_channel_data<br>
 int __ovld __cnfn get_image_channel_data_type(read_write image2d_array_msaa_t image);<br>
 int __ovld __cnfn get_image_channel_data_type(read_write image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the image channel order. Valid values are:<br>
@@ -15090,7 +15090,7 @@ int __ovld __cnfn get_image_channel_orde<br>
 int __ovld __cnfn get_image_channel_order(write_only image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld __cnfn get_image_channel_order(read_write image1d_t image);<br>
 int __ovld __cnfn get_image_channel_order(read_write image1d_buffer_t image);<br>
 int __ovld __cnfn get_image_channel_order(read_write image2d_t image);<br>
@@ -15107,7 +15107,7 @@ int __ovld __cnfn get_image_channel_orde<br>
 int __ovld __cnfn get_image_channel_order(read_write image2d_array_msaa_t image);<br>
 int __ovld __cnfn get_image_channel_order(read_write image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the 2D image width and height as an int2<br>
@@ -15140,7 +15140,7 @@ int2 __ovld __cnfn get_image_dim(write_o<br>
 int2 __ovld __cnfn get_image_dim(write_only image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int2 __ovld __cnfn get_image_dim(read_write image2d_t image);<br>
 int2 __ovld __cnfn get_image_dim(read_write image2d_array_t image);<br>
 #ifdef cl_khr_depth_images<br>
@@ -15153,7 +15153,7 @@ int2 __ovld __cnfn get_image_dim(read_wr<br>
 int2 __ovld __cnfn get_image_dim(read_write image2d_array_msaa_t image);<br>
 int2 __ovld __cnfn get_image_dim(read_write image2d_array_msaa_depth_t image);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the 3D image width, height, and depth as an<br>
@@ -15165,9 +15165,9 @@ int4 __ovld __cnfn get_image_dim(read_on<br>
 #ifdef cl_khr_3d_image_writes<br>
 int4 __ovld __cnfn get_image_dim(write_only image3d_t image);<br>
 #endif<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int4 __ovld __cnfn get_image_dim(read_write image3d_t image);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
  * Return the image array size.<br>
@@ -15193,7 +15193,7 @@ size_t __ovld __cnfn get_image_array_siz<br>
 size_t __ovld __cnfn get_image_array_size(write_only image2d_array_msaa_depth_t image_array);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 size_t __ovld __cnfn get_image_array_size(read_write image1d_array_t image_array);<br>
 size_t __ovld __cnfn get_image_array_size(read_write image2d_array_t image_array);<br>
 #ifdef cl_khr_depth_images<br>
@@ -15203,7 +15203,7 @@ size_t __ovld __cnfn get_image_array_siz<br>
 size_t __ovld __cnfn get_image_array_size(read_write image2d_array_msaa_t image_array);<br>
 size_t __ovld __cnfn get_image_array_size(read_write image2d_array_msaa_depth_t image_array);<br>
 #endif //cl_khr_gl_msaa_sharing<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 /**<br>
 * Return the number of samples associated with image<br>
@@ -15219,17 +15219,17 @@ int __ovld get_image_num_samples(write_o<br>
 int __ovld get_image_num_samples(write_only image2d_array_msaa_t image);<br>
 int __ovld get_image_num_samples(write_only image2d_array_msaa_depth_t image);<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld get_image_num_samples(read_write image2d_msaa_t image);<br>
 int __ovld get_image_num_samples(read_write image2d_msaa_depth_t image);<br>
 int __ovld get_image_num_samples(read_write image2d_array_msaa_t image);<br>
 int __ovld get_image_num_samples(read_write image2d_array_msaa_depth_t image);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 #endif<br>
 <br>
 // OpenCL v2.0 s6.13.15 - Work-group Functions<br>
 <br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 int __ovld __conv work_group_all(int predicate);<br>
 int __ovld __conv work_group_any(int predicate);<br>
 <br>
@@ -15327,16 +15327,16 @@ double __ovld __conv work_group_scan_inc<br>
 double __ovld __conv work_group_scan_inclusive_max(double x);<br>
 #endif //cl_khr_fp64<br>
 <br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL v2.0 s6.13.16 - Pipe Functions<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 bool __ovld is_valid_reserve_id(reserve_id_t reserve_id);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 <br>
 // OpenCL v2.0 s6.13.17 - Enqueue Kernels<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 ndrange_t __ovld ndrange_1D(size_t);<br>
 ndrange_t __ovld ndrange_1D(size_t, size_t);<br>
@@ -15365,7 +15365,7 @@ bool __ovld is_valid_event (clk_event_t<br>
 void __ovld capture_event_profiling_info(clk_event_t, clk_profiling_info, __global void* value);<br>
 <br>
 queue_t __ovld get_default_queue(void);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 // OpenCL Extension v2.0 s9.17 - Sub-groups<br>
 <br>
@@ -15374,16 +15374,16 @@ queue_t __ovld get_default_queue(void);<br>
 uint    __ovld get_sub_group_size(void);<br>
 uint    __ovld get_max_sub_group_size(void);<br>
 uint    __ovld get_num_sub_groups(void);<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 uint    __ovld get_enqueued_num_sub_groups(void);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 uint    __ovld get_sub_group_id(void);<br>
 uint    __ovld get_sub_group_local_id(void);<br>
 <br>
 void    __ovld __conv sub_group_barrier(cl_mem_fence_flags flags);<br>
-#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void    __ovld __conv sub_group_barrier(cl_mem_fence_flags flags, memory_scope scope);<br>
-#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0<br>
+#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 int     __ovld __conv sub_group_all(int predicate);<br>
 int     __ovld __conv sub_group_any(int predicate);<br>
@@ -15573,12 +15573,12 @@ uint2   __ovld __conv intel_sub_group_bl<br>
 uint4   __ovld __conv intel_sub_group_block_read4( read_only image2d_t image, int2 coord );<br>
 uint8   __ovld __conv intel_sub_group_block_read8( read_only image2d_t image, int2 coord );<br>
 <br>
-#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 uint    __ovld __conv intel_sub_group_block_read(read_write image2d_t image, int2 coord);<br>
 uint2   __ovld __conv intel_sub_group_block_read2(read_write image2d_t image, int2 coord);<br>
 uint4   __ovld __conv intel_sub_group_block_read4(read_write image2d_t image, int2 coord);<br>
 uint8   __ovld __conv intel_sub_group_block_read8(read_write image2d_t image, int2 coord);<br>
-#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 uint    __ovld __conv intel_sub_group_block_read( const __global uint* p );<br>
 uint2   __ovld __conv intel_sub_group_block_read2( const __global uint* p );<br>
@@ -15590,12 +15590,12 @@ void    __ovld __conv intel_sub_group_bl<br>
 void    __ovld __conv intel_sub_group_block_write4(write_only image2d_t image, int2 coord, uint4 data);<br>
 void    __ovld __conv intel_sub_group_block_write8(write_only image2d_t image, int2 coord, uint8 data);<br>
 <br>
-#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void    __ovld __conv intel_sub_group_block_write(read_write image2d_t image, int2 coord, uint data);<br>
 void    __ovld __conv intel_sub_group_block_write2(read_write image2d_t image, int2 coord, uint2 data);<br>
 void    __ovld __conv intel_sub_group_block_write4(read_write image2d_t image, int2 coord, uint4 data);<br>
 void    __ovld __conv intel_sub_group_block_write8(read_write image2d_t image, int2 coord, uint8 data);<br>
-#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 void    __ovld __conv intel_sub_group_block_write( __global uint* p, uint data );<br>
 void    __ovld __conv intel_sub_group_block_write2( __global uint* p, uint2 data );<br>
@@ -15713,12 +15713,12 @@ uint2      __ovld __conv intel_sub_group<br>
 uint4      __ovld __conv intel_sub_group_block_read_ui4( read_only image2d_t image, int2 byte_coord );<br>
 uint8      __ovld __conv intel_sub_group_block_read_ui8( read_only image2d_t image, int2 byte_coord );<br>
 <br>
-#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 uint       __ovld __conv intel_sub_group_block_read_ui( read_write image2d_t image, int2 byte_coord );<br>
 uint2      __ovld __conv intel_sub_group_block_read_ui2( read_write image2d_t image, int2 byte_coord );<br>
 uint4      __ovld __conv intel_sub_group_block_read_ui4( read_write image2d_t image, int2 byte_coord );<br>
 uint8      __ovld __conv intel_sub_group_block_read_ui8( read_write image2d_t image, int2 byte_coord );<br>
-#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 uint       __ovld __conv intel_sub_group_block_read_ui( const __global uint* p );<br>
 uint2      __ovld __conv intel_sub_group_block_read_ui2( const __global uint* p );<br>
@@ -15730,12 +15730,12 @@ void       __ovld __conv intel_sub_group<br>
 void       __ovld __conv intel_sub_group_block_write_ui4( read_only image2d_t image, int2 byte_coord, uint4 data );<br>
 void       __ovld __conv intel_sub_group_block_write_ui8( read_only image2d_t image, int2 byte_coord, uint8 data );<br>
 <br>
-#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void       __ovld __conv intel_sub_group_block_write_ui( read_write image2d_t image, int2 byte_coord, uint data );<br>
 void       __ovld __conv intel_sub_group_block_write_ui2( read_write image2d_t image, int2 byte_coord, uint2 data );<br>
 void       __ovld __conv intel_sub_group_block_write_ui4( read_write image2d_t image, int2 byte_coord, uint4 data );<br>
 void       __ovld __conv intel_sub_group_block_write_ui8( read_write image2d_t image, int2 byte_coord, uint8 data );<br>
-#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 void       __ovld __conv intel_sub_group_block_write_ui( __global uint* p, uint data );<br>
 void       __ovld __conv intel_sub_group_block_write_ui2( __global uint* p, uint2 data );<br>
@@ -15747,12 +15747,12 @@ ushort2     __ovld __conv intel_sub_grou<br>
 ushort4     __ovld __conv intel_sub_group_block_read_us4( read_only image2d_t image, int2 coord );<br>
 ushort8     __ovld __conv intel_sub_group_block_read_us8( read_only image2d_t image, int2 coord );<br>
 <br>
-#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 ushort      __ovld __conv intel_sub_group_block_read_us(read_write image2d_t image, int2 coord);<br>
 ushort2     __ovld __conv intel_sub_group_block_read_us2(read_write image2d_t image, int2 coord);<br>
 ushort4     __ovld __conv intel_sub_group_block_read_us4(read_write image2d_t image, int2 coord);<br>
 ushort8     __ovld __conv intel_sub_group_block_read_us8(read_write image2d_t image, int2 coord);<br>
-#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 ushort      __ovld __conv intel_sub_group_block_read_us(  const __global ushort* p );<br>
 ushort2     __ovld __conv intel_sub_group_block_read_us2( const __global ushort* p );<br>
@@ -15764,12 +15764,12 @@ void        __ovld __conv intel_sub_grou<br>
 void        __ovld __conv intel_sub_group_block_write_us4(write_only image2d_t image, int2 coord, ushort4 data);<br>
 void        __ovld __conv intel_sub_group_block_write_us8(write_only image2d_t image, int2 coord, ushort8 data);<br>
 <br>
-#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 void        __ovld __conv intel_sub_group_block_write_us(read_write image2d_t image, int2 coord, ushort  data);<br>
 void        __ovld __conv intel_sub_group_block_write_us2(read_write image2d_t image, int2 coord, ushort2 data);<br>
 void        __ovld __conv intel_sub_group_block_write_us4(read_write image2d_t image, int2 coord, ushort4 data);<br>
 void        __ovld __conv intel_sub_group_block_write_us8(read_write image2d_t image, int2 coord, ushort8 data);<br>
-#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
+#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)<br>
 <br>
 void        __ovld __conv intel_sub_group_block_write_us(  __global ushort* p, ushort  data );<br>
 void        __ovld __conv intel_sub_group_block_write_us2( __global ushort* p, ushort2 data );<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
cfe-commits@lists.llvm.org<br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div>
</span></font></div>
</div>
</div>
</div>
</body>
</html>