Skip to content

Default transform_iterator's copy ctor #3395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bernhardmgruber merged 2 commits into from
Jan 21, 2025
Merged

Default transform_iterator's copy ctor #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd81d8c
Default transform_iterator's copy ctor
bernhardmgruber Jan 15, 2025
3d5c55b
Make function object copyable
bernhardmgruber Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cub/test/catch2_large_array_sort_helper.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ template <typename KeyType>
class key_sort_ref_key_transform
{
static constexpr double max_key = static_cast<double>(::cuda::std::numeric_limits<KeyType>::max());
const double m_conversion;
double m_conversion;
std::size_t m_num_items;
bool m_is_descending;

Expand Down
35 changes: 1 addition & 34 deletions thrust/thrust/iterator/transform_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ class transform_iterator
/*! \endcond
*/

public:
/*! Null constructor does nothing.
*/
transform_iterator() = default;
Expand Down Expand Up @@ -239,20 +238,7 @@ class transform_iterator
, m_f(other.functor())
{}

/*! Copy assignment operator copies from another \p transform_iterator.
* \p other The other \p transform_iterator to copy
* \return <tt>*this</tt>
*
* \note If the type of this \p transform_iterator's functor is not copy assignable
* (for example, if it is a lambda) it is not an error to call this function.
* In this case, however, the functor will not be modified.
*
* In any case, this \p transform_iterator's underlying iterator will be copy assigned.
*/
_CCCL_HOST_DEVICE transform_iterator& operator=(const transform_iterator& other)
{
return do_assign(other, ::cuda::std::is_copy_assignable<AdaptableUnaryFunction>());
}
transform_iterator& operator=(const transform_iterator&) = default;

/*! This method returns a copy of this \p transform_iterator's \c AdaptableUnaryFunction.
* \return A copy of this \p transform_iterator's \c AdaptableUnaryFunction.
Expand All @@ -266,25 +252,6 @@ class transform_iterator
*/

private:
_CCCL_HOST_DEVICE transform_iterator& do_assign(const transform_iterator& other, thrust::detail::true_type)
{
super_t::operator=(other);

// do assign to m_f
m_f = other.functor();

return *this;
}

_CCCL_HOST_DEVICE transform_iterator& do_assign(const transform_iterator& other, thrust::detail::false_type)
{
super_t::operator=(other);

// don't assign to m_f

return *this;
}

// MSVC 2013 and 2015 incorrectly warning about returning a reference to
// a local/temporary here.
// See goo.gl/LELTNp
Expand Down