Skip to content

Commit b9520a5

Browse files
committed
buffer::set_final_data accepts weak_ptr<T>, not weak_ptr<T[]> or shared_ptr<T[]>
1 parent f1e6fd0 commit b9520a5

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

tests/buffer/buffer_storage_common.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,19 @@ class buffer_storage_test {
6363

6464
// Case 3 - Weak pointer
6565
std::shared_ptr<T[]> data_shared_ptr(new T[size]);
66-
std::weak_ptr<T[]> data_final3 = data_shared_ptr;
66+
std::shared_ptr<T> data_shared_ptr_alias(data_shared_ptr,
67+
data_shared_ptr.get());
68+
std::weak_ptr<T> data_final3 = data_shared_ptr_alias;
6769

68-
// Case 4 - Shared pointer
69-
std::shared_ptr<T[]> data_final4(new T[size]);
70-
71-
// Case 5 - Vector data
70+
// Case 4 - Vector iterator
7271
std::vector<T> data_vector;
7372
data_vector.resize(size);
74-
auto data_final5 = data_vector.begin();
73+
auto data_final4 = data_vector.begin();
7574

7675
check_write_back(log, r, data_final1.get());
7776
check_write_back(log, r, data_final2, true /*is_nullptr*/);
7877
check_write_back(log, r, data_final3);
7978
check_write_back(log, r, data_final4);
80-
check_write_back(log, r, data_final5);
8179
}
8280

8381
private:
@@ -99,12 +97,11 @@ class buffer_storage_test {
9997
}
10098
}
10199

102-
template <template <typename T1> class C>
103-
void check_write_back(util::logger &log, sycl::range<dims> r,
104-
C<T[]> final_data) {
100+
void check_write_back(util::logger& log, sycl::range<dims> r,
101+
std::weak_ptr<T> final_data) {
105102
use_buffer(final_data, r);
106103

107-
std::shared_ptr<T[]> ptr_shrd(final_data);
104+
auto ptr_shrd = final_data.lock();
108105
T *ptr = ptr_shrd.get();
109106
for (size_t i = 0; i < size; ++i) {
110107
check_equal_values(ptr[i], (T)0xFF);

0 commit comments

Comments
 (0)