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

Yesterday "#include <memory>" was added to thrust/detail/allocator/allocator_traits.inl. That caused a regression when compiling with NVC++, breaking #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.)
NVIDIA · Jul 10, 2020 · e1681ff · e1681ff
1 parent d409930
commit e1681ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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