diff --git a/sycl/include/CL/sycl/multi_ptr.hpp b/sycl/include/CL/sycl/multi_ptr.hpp index 808d165e868d1..812c946f31361 100644 --- a/sycl/include/CL/sycl/multi_ptr.hpp +++ b/sycl/include/CL/sycl/multi_ptr.hpp @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include @@ -407,12 +407,6 @@ class multi_ptr { multi_ptr(const multi_ptr &) = default; multi_ptr(multi_ptr &&) = default; multi_ptr(pointer_t pointer) : m_Pointer(pointer) {} -#ifdef __SYCL_DEVICE_ONLY__ - multi_ptr(const void *pointer) : m_Pointer((pointer_t)pointer) { - // TODO An implementation should reject an argument if the deduced - // address space is not compatible with Space. - } -#endif multi_ptr(std::nullptr_t) : m_Pointer(nullptr) {} ~multi_ptr() = default; diff --git a/sycl/test/devicelib/assert.cpp b/sycl/test/devicelib/assert.cpp index d0f18fe8cb544..634d1015e83e2 100644 --- a/sycl/test/devicelib/assert.cpp +++ b/sycl/test/devicelib/assert.cpp @@ -70,7 +70,7 @@ // // Overall this sounds stable enough. What could possibly go wrong? // -// RUN: env SYCL_PI_TRACE=1 CL_CONFIG_USE_VECTORIZER=False SYCL_DEVICE_TYPE=CPU EXPECTED_SIGNAL=SIGABRT SKIP_IF_NO_EXT=1 %t.out 2>%t.stderr.native >%t.stdout.native +// RUN: env SYCL_PI_TRACE=1 CL_CONFIG_USE_VECTORIZER=False SYCL_DEVICE_TYPE=CPU EXPECTED_SIGNAL=SIGABRT SKIP_IF_NO_EXT=1 %t.out 2>%t.stderr.native >%t.stdout.native // RUN: FileCheck %s --input-file %t.stdout.native --check-prefixes=CHECK-NATIVE || FileCheck %s --input-file %t.stderr.native --check-prefix CHECK-NOTSUPPORTED // RUN: FileCheck %s --input-file %t.stderr.native --check-prefixes=CHECK-MESSAGE || FileCheck %s --input-file %t.stderr.native --check-prefix CHECK-NOTSUPPORTED //