Merge pull request #1443 from dtolnay/rangesheader

Move ranges header to cxx.h
dtolnay · Feb 19, 2025 · 8d3ed92 · 8d3ed92
2 parents 0243229 + be38b9d
commit 8d3ed92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/gen/src/include.rs b/gen/src/include.rs
@@ -157,7 +157,7 @@ pub(super) fn write(out: &mut OutFile) {
     if vector && !cxx_header {
         writeln!(out, "#include <vector>");
     }
-    if ranges {
+    if ranges && !cxx_header {
         writeln!(out, "#if __cplusplus >= 202002L");
         writeln!(out, "#include <ranges>");
         writeln!(out, "#endif");

diff --git a/include/cxx.h b/include/cxx.h
@@ -9,6 +9,9 @@
 #include <iosfwd>
 #include <iterator>
 #include <new>
+#if __cplusplus >= 202002L
+#include <ranges>
+#endif
 #include <stdexcept>
 #include <string>
 #include <type_traits>