@@ -255,6 +255,7 @@ template <tested_types required> auto get_tested_types() {
255
255
return named_type_pack<
256
256
char , unsigned char , signed char , short , unsigned short , int ,
257
257
unsigned int , long , unsigned long , float , long long ,
258
+ <<<<<<< HEAD
258
259
unsigned long long >::generate (" char" , " unsigned char" , " signed char" ,
259
260
" short" , " unsigned short" , " int" ,
260
261
" unsigned int" , " long" , " unsigned long" ,
@@ -273,11 +274,13 @@ template <tested_types required> auto get_tested_types() {
273
274
return named_type_pack<
274
275
char , unsigned char , signed char , short , unsigned short , int ,
275
276
unsigned int , long , unsigned long , float , sycl::half, double , long long ,
277
+ =======
278
+ >>>>>>> f3c83b533 ([SYCL][ESIMD] Remove sycl::half and double from core types (#831 ))
276
279
unsigned long long >::generate (" char" , " unsigned char" , " signed char" ,
277
280
" short" , " unsigned short" , " int" ,
278
281
" unsigned int" , " long" , " unsigned long" ,
279
- " float" , " sycl::half " , " double " ,
280
- " long long " , " unsigned long long" );
282
+ " float" , " long long " ,
283
+ " unsigned long long" );
281
284
} else if constexpr (required == tested_types::fp) {
282
285
<<<<<<< HEAD
283
286
return named_type_pack<float , sycl::half, double >::generate (
0 commit comments