Add guards for <format>

bemanproject · Jun 19, 2024 · 77fb8da · 77fb8da
1 parent 777ddb1
commit 77fb8da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/include/Beman/Optional26/optional.hpp b/include/Beman/Optional26/optional.hpp
@@ -165,7 +165,9 @@ namespace std {
 */
 
 #include <compare>
+#if defined(__cpp_lib_format_ranges)
 #include <format>
+#endif
 #include <functional>
 #include <ranges>
 #include <type_traits>
@@ -214,7 +216,6 @@ template <typename T>
 inline constexpr bool ranges::enable_borrowed_range<beman::optional::optional<T&>> = true;
 
 // Since P3168R1: Give std::optional Range Support.
-// TODO: Always enable when all major compilers implement P2585R1: "Improve default container formatting".
 #if defined(__cpp_lib_format_ranges)
 template <class T>
 inline constexpr auto format_kind<beman::optional::optional<T>> = range_format::disabled;

diff --git a/src/Beman/Optional26/tests/optional_range_support.t.cpp b/src/Beman/Optional26/tests/optional_range_support.t.cpp
@@ -8,7 +8,9 @@
 #include <Beman/Optional26/optional.hpp>
 
 #include <algorithm>
+#if defined(__cpp_lib_format_ranges)
 #include <format>
+#endif
 #include <functional>
 #include <ranges>
 #include <tuple>