Include <thrust/detail/memory_wrapper.h>, not <memory>

dkolsen-pgi · alliepiper · commit 376a4005c74e · 2020-07-10T19:20:29.000-04:00
Yesterday "#include <memory>" was added to thrust/detail/allocator/allocator_traits.inl. That caused a regression when compiling with NVC++, breaking NVIDIA#1218. This fix changes that include to be "#include <thrust/detail/memory_wrapper.h>". (And it makes the same change to a different include of <memory> that I seem to have missed in my earlier commit.)
diff --git a/thrust/allocate_unique.h b/thrust/allocate_unique.h
@@ -16,7 +16,7 @@
 #include <thrust/detail/allocator/allocator_traits.h>
 
 #include <utility>
-#include <memory>
+#include <thrust/detail/memory_wrapper.h>
 
 namespace thrust
 {
diff --git a/thrust/detail/allocator/allocator_traits.inl b/thrust/detail/allocator/allocator_traits.inl
@@ -23,7 +23,7 @@
   #include <thrust/detail/type_deduction.h>
 #endif
 
-#include <memory>
+#include <thrust/detail/memory_wrapper.h>
 #include <new>
 
 namespace thrust

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#include <thrust/detail/allocator/allocator_traits.h>`
`17`	`17`
`18`	`18`	`#include <utility>`
`19`		`-#include <memory>`
	`19`	`+#include <thrust/detail/memory_wrapper.h>`
`20`	`20`
`21`	`21`	`namespace thrust`
`22`	`22`	`{`