[SYCLomatic] Fix replace_if/replace_copy_if for corner case (#584)

* [SYCLomatic] Fix replace_copy_if for long long

Signed-off-by: Lu, John <[email protected]>

* [SYClomatic] fix replace_if/replace_copy_if corner case

Signed-off-by: Lu, John <[email protected]>

* Deal with corner case of replace_copy_if. long -> long long

Signed-off-by: Lu, John <[email protected]>

---------

Signed-off-by: Lu, John <[email protected]>

Author: LU-JOHN

clang/runtime/dpct-rt/include/dpl_extras/algorithm.h.inc

@@ -69,7 +69,7 @@ void replace_if(Policy &&policy, Iter1 first, Iter1 last, Iter2 mask, Pred p,
                        std::random_access_iterator_tag>::value,
       "Iterators passed to algorithms must be random-access iterators.");
   std::transform(std::forward<Policy>(policy), first, last, mask, first,
-                 internal::replace_if_fun<T, Pred>(p, new_value));
+                 internal::replace_if_fun<typename std::iterator_traits<Iter1>::value_type, Pred>(p, new_value));
 }
 // DPCT_LABEL_END
 
@@ -91,7 +91,7 @@ Iter3 replace_copy_if(Policy &&policy, Iter1 first, Iter1 last, Iter2 mask,
                        std::random_access_iterator_tag>::value,
       "Iterators passed to algorithms must be random-access iterators.");
   return std::transform(std::forward<Policy>(policy), first, last, mask, result,
-                        internal::replace_if_fun<T, Pred>(p, new_value));
+                        internal::replace_if_fun<typename std::iterator_traits<Iter3>::value_type, Pred>(p, new_value));
 }
 // DPCT_LABEL_END
 

clang/test/dpct/helper_files_ref/include/dpl_extras/algorithm.h

@@ -30,7 +30,7 @@ void replace_if(Policy &&policy, Iter1 first, Iter1 last, Iter2 mask, Pred p,
                        std::random_access_iterator_tag>::value,
       "Iterators passed to algorithms must be random-access iterators.");
   std::transform(std::forward<Policy>(policy), first, last, mask, first,
-                 internal::replace_if_fun<T, Pred>(p, new_value));
+                 internal::replace_if_fun<typename std::iterator_traits<Iter1>::value_type, Pred>(p, new_value));
 }
 
 template <typename Policy, typename Iter1, typename Iter2, typename Iter3,
@@ -46,7 +46,7 @@ Iter3 replace_copy_if(Policy &&policy, Iter1 first, Iter1 last, Iter2 mask,
                        std::random_access_iterator_tag>::value,
       "Iterators passed to algorithms must be random-access iterators.");
   return std::transform(std::forward<Policy>(policy), first, last, mask, result,
-                        internal::replace_if_fun<T, Pred>(p, new_value));
+                        internal::replace_if_fun<typename std::iterator_traits<Iter3>::value_type, Pred>(p, new_value));
 }
 
 template <typename Policy, typename Iter1, typename Iter2, typename Pred>