Merge pull request NVIDIA#1423 from jrhemstad/fix-transform-iterator-noncopyable

Fix transform_iterator with non-copyable types

Author: alliepiper

testing/transform_iterator.cu

@@ -7,6 +7,8 @@
 #include <thrust/sequence.h>
 #include <thrust/iterator/counting_iterator.h>
 
+#include <memory>
+
 template <class Vector>
 void TestTransformIterator(void)
 {
@@ -84,3 +86,28 @@ struct TestTransformIteratorReduce
 };
 VariableUnitTest<TestTransformIteratorReduce, IntegralTypes> TestTransformIteratorReduceInstance;
 
+
+struct ExtractValue{
+    int operator()(std::unique_ptr<int> const& n){
+        return *n;
+    }
+};
+
+void TestTransformIteratorNonCopyable(){
+
+    thrust::host_vector<std::unique_ptr<int>> hv(4);
+    hv[0].reset(new int{1});
+    hv[1].reset(new int{2});
+    hv[2].reset(new int{3});
+    hv[3].reset(new int{4});
+
+    auto transformed = thrust::make_transform_iterator(hv.begin(), ExtractValue{});
+    ASSERT_EQUAL(transformed[0], 1);
+    ASSERT_EQUAL(transformed[1], 2);
+    ASSERT_EQUAL(transformed[2], 3);
+    ASSERT_EQUAL(transformed[3], 4);
+
+}
+
+DECLARE_UNITTEST(TestTransformIteratorNonCopyable);
+

thrust/iterator/transform_iterator.h

@@ -312,7 +312,7 @@ template <class AdaptableUnaryFunction, class Iterator, class Reference = use_de
       // Create a temporary to allow iterators with wrapped references to
       // convert to their value type before calling m_f. Note that this
       // disallows non-constant operations through m_f.
-      typename thrust::iterator_value<Iterator>::type x = *this->base();
+      typename thrust::iterator_value<Iterator>::type const& x = *this->base();
       return m_f(x);
     }