don't depend on <memory_resource>

NVIDIA · Nov 1, 2023 · da9815f · da9815f
1 parent c9a8547
commit da9815f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/include/stdexec/__detail/__config.hpp b/include/stdexec/__detail/__config.hpp
@@ -290,6 +290,13 @@
 #define STDEXEC_HAS_STD_RANGES() 0
 #endif
 
+#if __has_include(<memory_resource>) && \
+  (defined(__cpp_lib_memory_resource) && __cpp_lib_memory_resource >= 201603L)
+#define STDEXEC_HAS_STD_MEMORY_RESOURCE() 1
+#else
+#define STDEXEC_HAS_STD_MEMORY_RESOURCE() 0
+#endif
+
 #ifdef STDEXEC_ASSERT
 #error "Redefinition of STDEXEC_ASSERT is not permitted. Define STDEXEC_ASSERT_FN instead."
 #endif

diff --git a/include/stdexec/__detail/__memory.hpp b/include/stdexec/__detail/__memory.hpp
@@ -19,7 +19,7 @@
 #include "__scope.hpp"
 
 #include <memory>
-#include <memory_resource>
+#include <new>
 
 namespace stdexec {
   namespace __mem {

diff --git a/test/stdexec/algos/consumers/test_start_detached.cpp b/test/stdexec/algos/consumers/test_start_detached.cpp
@@ -22,7 +22,10 @@
 #include <exec/env.hpp>
 
 #include <chrono>
+
+#if STDEXEC_HAS_STD_MEMORY_RESOURCE()
 #include <memory_resource>
+#endif
 
 namespace ex = stdexec;
 
@@ -162,6 +165,9 @@ namespace {
     CHECK_FALSE(called);
   }
 
+#if STDEXEC_HAS_STD_MEMORY_RESOURCE() && \
+  (defined(__cpp_lib_polymorphic_allocator) && __cpp_lib_polymorphic_allocator >= 201902L)
+
   struct counting_resource : std::pmr::memory_resource {
     counting_resource() = default;
 
@@ -201,5 +207,8 @@ namespace {
     CHECK(res.get_count() == 1);
     CHECK(res.get_alive() == 0);
   }
+#endif
+
 }
+
 STDEXEC_PRAGMA_POP()