From 96e4ed5a2455a47578c4d6e8baa51c6a4fa5b355 Mon Sep 17 00:00:00 2001
From: Alexander Batashev <alexander.batashev@intel.com>
Date: Thu, 2 Sep 2021 10:25:27 +0300
Subject: [PATCH 1/2] [SYCL] Remove function pointers extension

---
 .../include/CL/sycl/ONEAPI/function_pointer.hpp | 17 -----------------
 ...ction_pointer.hpp => __function_pointer.hpp} |  4 ++++
 sycl/source/function_pointer.cpp                |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 sycl/include/CL/sycl/ONEAPI/function_pointer.hpp
 rename sycl/include/sycl/ext/oneapi/{function_pointer.hpp => __function_pointer.hpp} (99%)

diff --git a/sycl/include/CL/sycl/ONEAPI/function_pointer.hpp b/sycl/include/CL/sycl/ONEAPI/function_pointer.hpp
deleted file mode 100644
index abf0c6ae9691b..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/function_pointer.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----------- function_pointer.hpp --- SYCL Function pointers ------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/function_pointer.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/function_pointer.hpp instead")
-
-#include <sycl/ext/oneapi/function_pointer.hpp>
diff --git a/sycl/include/sycl/ext/oneapi/function_pointer.hpp b/sycl/include/sycl/ext/oneapi/__function_pointer.hpp
similarity index 99%
rename from sycl/include/sycl/ext/oneapi/function_pointer.hpp
rename to sycl/include/sycl/ext/oneapi/__function_pointer.hpp
index 9fbfb39e9e556..d0d39e447fcc8 100644
--- a/sycl/include/sycl/ext/oneapi/function_pointer.hpp
+++ b/sycl/include/sycl/ext/oneapi/__function_pointer.hpp
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#ifdef __SYCL_INTERNAL_API
+
 #include <CL/sycl/detail/export.hpp>
 #include <CL/sycl/detail/stl_type_traits.hpp>
 #include <CL/sycl/device.hpp>
@@ -91,3 +93,5 @@ namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
 }
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
+
+#endif
diff --git a/sycl/source/function_pointer.cpp b/sycl/source/function_pointer.cpp
index 18fa8f3f99e72..ce657883fdc5a 100644
--- a/sycl/source/function_pointer.cpp
+++ b/sycl/source/function_pointer.cpp
@@ -8,7 +8,7 @@
 
 #include <detail/device_impl.hpp>
 #include <detail/program_impl.hpp>
-#include <sycl/ext/oneapi/function_pointer.hpp>
+#include <sycl/ext/oneapi/__function_pointer.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

From 34e5e19d7b037467624567d53d0f47d319056863 Mon Sep 17 00:00:00 2001
From: Alexander Batashev <alexander.batashev@intel.com>
Date: Thu, 2 Sep 2021 10:38:57 +0300
Subject: [PATCH 2/2] remove some leftovers

---
 sycl/include/CL/sycl.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sycl/include/CL/sycl.hpp b/sycl/include/CL/sycl.hpp
index 75f0cedd57c44..4497fedaaf530 100644
--- a/sycl/include/CL/sycl.hpp
+++ b/sycl/include/CL/sycl.hpp
@@ -54,7 +54,6 @@
 #include <sycl/ext/oneapi/atomic.hpp>
 #include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/ext/oneapi/filter_selector.hpp>
-#include <sycl/ext/oneapi/function_pointer.hpp>
 #include <sycl/ext/oneapi/group_algorithm.hpp>
 #include <sycl/ext/oneapi/matrix/matrix.hpp>
 #include <sycl/ext/oneapi/reduction.hpp>