[oneDPL][ranges] removed _ONEDPL_PREPARE_CALLABLE wrapper

oneapi-src · Nov 15, 2024 · b850deb · b850deb
1 parent 545cd75
commit b850deb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/include/oneapi/dpl/pstl/glue_algorithm_ranges_impl.h b/include/oneapi/dpl/pstl/glue_algorithm_ranges_impl.h
@@ -426,7 +426,7 @@ struct __stable_sort_fn
         const auto __dispatch_tag = oneapi::dpl::__ranges::__select_backend(__exec);
         return oneapi::dpl::__internal::__ranges::__pattern_sort_ranges(__dispatch_tag,
             std::forward<_ExecutionPolicy>(__exec), std::forward<_R>(__r), __comp, __proj,
-            _ONEDPL_PREPARE_CALLABLE(std::ranges::stable_sort)
+            [](auto&&... __args) { return std::ranges::stable_sort(std::forward<decltype(__args)>(__args)...); }
             );
     }
 }; //__stable_sort_fn
@@ -448,7 +448,7 @@ struct __sort_fn
         const auto __dispatch_tag = oneapi::dpl::__ranges::__select_backend(__exec);
         return oneapi::dpl::__internal::__ranges::__pattern_sort_ranges(__dispatch_tag,
             std::forward<_ExecutionPolicy>(__exec), std::forward<_R>(__r), __comp, __proj,
-            _ONEDPL_PREPARE_CALLABLE(std::ranges::sort)
+            [](auto&&... __args) { return std::ranges::sort(std::forward<decltype(__args)>(__args)...); }
             );
     }
 }; //__sort_fn

diff --git a/include/oneapi/dpl/pstl/onedpl_config.h b/include/oneapi/dpl/pstl/onedpl_config.h
@@ -326,18 +326,4 @@
 #    define _ONEDPL_STD_BIT_FLOOR_BROKEN 0
 #endif
 
-// The implementation of std::ranges algorithms in MS C++ standard library is done via C++ functions.
-#if defined(_MSC_VER) && (_MSC_VER < 1939)
-#    define _ONEDPL_STD_RANGES_ALGO_CPP_FUN 1
-#else
-#    define _ONEDPL_STD_RANGES_ALGO_CPP_FUN 0
-#endif
-
-#if _ONEDPL_STD_RANGES_ALGO_CPP_FUN
-#   define _ONEDPL_PREPARE_CALLABLE(std_algo_name) \
-[](auto&&... __args) { return std_algo_name(std::forward<decltype(__args)>(__args)...); }
-#else
-#    define _ONEDPL_PREPARE_CALLABLE(std_algo_name) std_algo_name
-#endif
-
 #endif // _ONEDPL_CONFIG_H