From 8a012449915764851689d874621454702bab7850 Mon Sep 17 00:00:00 2001
From: Adam Lugowski <alugowski@gmail.com>
Date: Sun, 17 Dec 2023 23:18:35 -0800
Subject: [PATCH] Drop amalgamate tag

---
 tests/supplement_test.cpp   | 9 ++++-----
 tools/amalgamate_header.hpp | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/supplement_test.cpp b/tests/supplement_test.cpp
index 93ea5e3..cdf69eb 100644
--- a/tests/supplement_test.cpp
+++ b/tests/supplement_test.cpp
@@ -21,14 +21,13 @@
 #define POOLSTL_STD_SUPPLEMENT
 #include <poolstl/poolstl.hpp>
 
-#ifndef POOLSTL_AMALGAM
-// Test poolstl::variant_policy.
-// Not bundled with the amalgam.
+#if __has_include(<poolstl/variant_policy.hpp>)
+// Test poolstl::variant_policy (independent header, not bundled with the amalgam).
 #include <poolstl/variant_policy.hpp>
 using std_policy_variant = std::variant<std::execution::parallel_policy, std::execution::sequenced_policy>;
 
 /**
- * A version of poolstl::par_if that works on the std execution policies.
+ * A version of poolstl::par_if that works on the std::execution policies.
  */
 poolstl::variant_policy<std_policy_variant> std_par_if(bool call_par) {
     if (call_par) {
@@ -62,7 +61,7 @@ int main() {
     });
     std::cout << " std::execution::par_unseq" << std::endl;
 
-#ifndef POOLSTL_AMALGAM
+#if __has_include(<poolstl/variant_policy.hpp>)
     for (bool is_parallel : {true, false}) {
         std::for_each(std_par_if(is_parallel), v.cbegin(), v.cend(), [](int x) {
             std::cout << x;
diff --git a/tools/amalgamate_header.hpp b/tools/amalgamate_header.hpp
index 9ba21fd..9640352 100644
--- a/tools/amalgamate_header.hpp
+++ b/tools/amalgamate_header.hpp
@@ -84,6 +84,3 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef POOLSTL_AMALGAM
-#define POOLSTL_AMALGAM
-#endif