Added explicit aliases to remained function objects

Author: maximdimakov

sycl/include/CL/sycl/functional.hpp

@@ -17,8 +17,6 @@ template <typename T = void> using multiplies = std::multiplies<T>;
 template <typename T = void> using bit_or = std::bit_or<T>;
 template <typename T = void> using bit_xor = std::bit_xor<T>;
 template <typename T = void> using bit_and = std::bit_and<T>;
-template <typename T = void> using logical_and = std::logical_and<T>;
-template <typename T = void> using logical_or = std::logical_or<T>;
 
 template <typename T = void> struct minimum {
   T operator()(const T &lhs, const T &rhs) const {

sycl/test/on-device/group_algorithms_sycl2020/exclusive_scan.cpp

@@ -151,11 +151,11 @@ int main() {
                                  std::numeric_limits<int>::lowest());
 
 #ifdef SPIRV_1_3
-  test<class KernelName_VzAPutpBRRJrQPB>(q, input, output, multiplies<int>(),
+  test<class KernelName_VzAPutpBRRJrQPB>(q, input, output, sycl::multiplies<int>(),
                                          1);
-  test<class KernelName_UXdGbr>(q, input, output, bit_or<int>(), 0);
-  test<class KernelName_saYaodNyJknrPW>(q, input, output, bit_xor<int>(), 0);
-  test<class KernelName_GPcuAlvAOjrDyP>(q, input, output, bit_and<int>(), ~0);
+  test<class KernelName_UXdGbr>(q, input, output, sycl::bit_or<int>(), 0);
+  test<class KernelName_saYaodNyJknrPW>(q, input, output, sycl::bit_xor<int>(), 0);
+  test<class KernelName_GPcuAlvAOjrDyP>(q, input, output, sycl::bit_and<int>(), ~0);
 #endif // SPIRV_1_3
 
   std::cout << "Test passed." << std::endl;

sycl/test/on-device/group_algorithms_sycl2020/inclusive_scan.cpp

@@ -152,11 +152,11 @@ int main() {
 
 #ifdef SPIRV_1_3
   test<class KernelName_zMyjxUrBgeUGoxmDwhvJ>(q, input, output,
-                                              multiplies<int>(), 1);
-  test<class KernelName_SljjtroxNRaAXoVnT>(q, input, output, bit_or<int>(), 0);
-  test<class KernelName_yXIZfjwjxQGiPeQAnc>(q, input, output, bit_xor<int>(),
+                                              sycl::multiplies<int>(), 1);
+  test<class KernelName_SljjtroxNRaAXoVnT>(q, input, output, sycl::bit_or<int>(), 0);
+  test<class KernelName_yXIZfjwjxQGiPeQAnc>(q, input, output, sycl::bit_xor<int>(),
                                             0);
-  test<class KernelName_xGnAnMYHvqekCk>(q, input, output, bit_and<int>(), ~0);
+  test<class KernelName_xGnAnMYHvqekCk>(q, input, output, sycl::bit_and<int>(), ~0);
 #endif // SPIRV_1_3
 
   std::cout << "Test passed." << std::endl;

sycl/test/on-device/group_algorithms_sycl2020/reduce.cpp

@@ -88,10 +88,10 @@ int main() {
 
 #ifdef SPIRV_1_3
   test<class KernelName_WonwuUVPUPOTKRKIBtT>(q, input, output,
-                                             multiplies<int>(), 1);
-  test<class KernelName_qYBaJDZTMGkdIwD>(q, input, output, bit_or<int>(), 0);
-  test<class KernelName_eLSFt>(q, input, output, bit_xor<int>(), 0);
-  test<class KernelName_uFhJnxSVhNAiFPTG>(q, input, output, bit_and<int>(), ~0);
+                                             sycl::multiplies<int>(), 1);
+  test<class KernelName_qYBaJDZTMGkdIwD>(q, input, output, sycl::bit_or<int>(), 0);
+  test<class KernelName_eLSFt>(q, input, output, sycl::bit_xor<int>(), 0);
+  test<class KernelName_uFhJnxSVhNAiFPTG>(q, input, output, sycl::bit_and<int>(), ~0);
 #endif // SPIRV_1_3
 
   std::cout << "Test passed." << std::endl;