Skip to content

Commit

Permalink
Merge branch 'fix-namespace-in-thrust-adaptor' into 'master'
Browse files Browse the repository at this point in the history
fix namespace path in iterator_system detection

See merge request correaa/boost-multi!1244
  • Loading branch information
correaa committed Oct 5, 2024
2 parents d79953e + 32506ff commit 1dc6188
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/boost/multi/adaptors/thrust.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ namespace thrust {

// template<class It> struct iterator_system; // not needed in cuda 12.0, doesn't work on cuda 12.5

template<class T, boost::multi::dimensionality_type D, class Pointer, bool IsConst>
struct iterator_system<boost::multi::array_iterator<T, D, Pointer, IsConst>>{
template<class T, ::boost::multi::dimensionality_type D, class Pointer, bool IsConst>
struct iterator_system<::boost::multi::array_iterator<T, D, Pointer, IsConst>>{
using type = typename ::thrust::iterator_system<typename boost::multi::array_iterator<T, D, Pointer, IsConst>::element_ptr>::type;
};

template<typename Pointer, class LayoutType>
struct iterator_system<boost::multi::elements_iterator_t<Pointer, LayoutType>> { // TODO(correaa) might need changes for IsConst templating
using type = typename ::thrust::iterator_system<typename boost::multi::elements_iterator_t<Pointer, LayoutType>::pointer>::type;
struct iterator_system<::boost::multi::elements_iterator_t<Pointer, LayoutType>> { // TODO(correaa) might need changes for IsConst templating
using type = typename ::thrust::iterator_system<typename ::boost::multi::elements_iterator_t<Pointer, LayoutType>::pointer>::type;
};

// namespace detail {
Expand Down

0 comments on commit 1dc6188

Please sign in to comment.