fix 3-way merge conflicts in union_kernel_param.cpp

myler · myler · commit bb846ff662c4 · 2022-08-17T15:01:16.000+08:00
diff --git a/SYCL/KernelParams/union_kernel_param.cpp b/SYCL/KernelParams/union_kernel_param.cpp
@@ -25,7 +25,7 @@ int main(int argc, char **argv) {
 
   sycl::queue queue;
   {
-    sycl::buffer<double, 1> buf(&mydouble, 1);
+    sycl::buffer<float, 1> buf(&myfloat, 1);
     queue.submit([&](sycl::handler &cgh) {
       auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
       cgh.single_task<class test>([=]() { acc[0] = x.myfloat; });

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ int main(int argc, char **argv) {`
`25`	`25`
`26`	`26`	`sycl::queue queue;`
`27`	`27`	`{`
`28`		`- sycl::buffer<double, 1> buf(&mydouble, 1);`
	`28`	`+ sycl::buffer<float, 1> buf(&myfloat, 1);`
`29`	`29`	`queue.submit([&](sycl::handler &cgh) {`
`30`	`30`	`auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);`
`31`	`31`	`cgh.single_task<class test>([=]() { acc[0] = x.myfloat; });`