React to comments

Signed-off-by: Alexander Batashev <[email protected]>

Author: Alexander Batashev

sycl/include/CL/sycl/device.hpp

@@ -21,6 +21,9 @@ namespace sycl {
 class device_selector;
 namespace detail {
 class device_impl;
+
+// Helper function to avoid calls to implementation detail methods.
+pi_device getRawDevice(device &D);
 }
 
 class device {

sycl/include/CL/sycl/intel/function_pointer.hpp

@@ -16,11 +16,6 @@
 
 __SYCL_INLINE namespace cl {
 namespace sycl {
-namespace detail {
-// Helper functions to avoid calls to implementation detail methods.
-pi_device getRawDevice(device &D);
-pi_program getRawProgram(program &P);
-} // namespace detail
 namespace intel {
 
 // This is a preview extension implementation, intended to provide early access

sycl/include/CL/sycl/program.hpp

@@ -23,6 +23,9 @@ class context;
 class device;
 namespace detail {
 class program_impl;
+
+// Helper function to avoid calls to implementation detail methods.
+pi_program getRawProgram(program &P);
 }
 
 enum class program_state { none, compiled, linked };

sycl/source/CMakeLists.txt

@@ -88,7 +88,6 @@ set(SYCL_SOURCES
     "event.cpp"
     "exception.cpp"
     "exception_list.cpp"
-    "function_pointer.cpp"
     "half_type.cpp"
     "handler.cpp"
     "kernel.cpp"

sycl/source/device.cpp

@@ -22,6 +22,9 @@ void force_type(info::device_type &t, const info::device_type &ft) {
     throw cl::sycl::invalid_parameter_error("No device of forced type.");
   }
 }
+pi_device getRawDevice(device &D) {
+  return detail::pi::cast<pi_device>(detail::getSyclObjImpl(D)->getHandleRef());
+}
 } // namespace detail
 
 device::device() : impl(std::make_shared<detail::device_impl>()) {}

sycl/source/function_pointer.cpp

@@ -13,7 +13,12 @@
 
 __SYCL_INLINE namespace cl {
 namespace sycl {
-
+namespace detail {
+pi_program getRawProgram(program &P) {
+  return detail::pi::cast<pi_program>(
+      detail::getSyclObjImpl(P)->getHandleRef());
+}
+} // namespace detail
 program::program(const context &context)
     : impl(std::make_shared<detail::program_impl>(
           detail::getSyclObjImpl(context))) {}