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 #include #include -#include #include #include #include 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 - -__SYCL_WARNING("CL/sycl/ONEAPI/function_pointer.hpp usage is " - "deprecated, include " - "sycl/ext/oneapi/function_pointer.hpp instead") - -#include 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 #include #include @@ -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 #include -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl {