aboutsummaryrefslogtreecommitdiff
path: root/libcxx/include/__format
diff options
context:
space:
mode:
authorIan Anderson <iana@apple.com>2023-06-26 14:07:50 -0700
committerIan Anderson <iana@apple.com>2023-06-27 10:52:08 -0700
commitd5ce68afdf65fd8906d9570c0a71d3557de70838 (patch)
treebebec4b9d380b06e18ce0d9c5599dedc3880c9c3 /libcxx/include/__format
parent1bd69ae0c5a7e704979f6efa1c7d7c39d4e2d5c9 (diff)
downloadllvm-d5ce68afdf65fd8906d9570c0a71d3557de70838.zip
llvm-d5ce68afdf65fd8906d9570c0a71d3557de70838.tar.gz
llvm-d5ce68afdf65fd8906d9570c0a71d3557de70838.tar.bz2
[libc++] __iterator/readable_traits.h isn't standalone
`__iterator/readable_traits.h` can't be used by itself, intantiating `iter_value_t` requires `__iterator/iterator_traits.h`. `readable_traits.h` can't include `iterator_traits.h` though because `iterator_traits.h` requires `readable_traits.h`. Move `iter_value_t` to `__iterator/iterator_traits.h` so that both headers can work standalone. Reviewed By: Mordante, #libc Differential Revision: https://reviews.llvm.org/D153828
Diffstat (limited to 'libcxx/include/__format')
-rw-r--r--libcxx/include/__format/format_functions.h2
-rw-r--r--libcxx/include/__format/format_string.h2
-rw-r--r--libcxx/include/__format/formatter_output.h2
-rw-r--r--libcxx/include/__format/parser_std_format_spec.h2
-rw-r--r--libcxx/include/__format/unicode.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/include/__format/format_functions.h b/libcxx/include/__format/format_functions.h
index c8b5904..0e89ef9 100644
--- a/libcxx/include/__format/format_functions.h
+++ b/libcxx/include/__format/format_functions.h
@@ -36,7 +36,7 @@
#include <__iterator/back_insert_iterator.h>
#include <__iterator/concepts.h>
#include <__iterator/incrementable_traits.h>
-#include <__iterator/readable_traits.h> // iter_value_t
+#include <__iterator/iterator_traits.h> // iter_value_t
#include <__variant/monostate.h>
#include <array>
#include <string>
diff --git a/libcxx/include/__format/format_string.h b/libcxx/include/__format/format_string.h
index bec3fe1..4d787ca 100644
--- a/libcxx/include/__format/format_string.h
+++ b/libcxx/include/__format/format_string.h
@@ -14,7 +14,7 @@
#include <__config>
#include <__format/format_error.h>
#include <__iterator/concepts.h>
-#include <__iterator/readable_traits.h> // iter_value_t
+#include <__iterator/iterator_traits.h> // iter_value_t
#include <cstddef>
#include <cstdint>
diff --git a/libcxx/include/__format/formatter_output.h b/libcxx/include/__format/formatter_output.h
index 2a26ce8..85f4577 100644
--- a/libcxx/include/__format/formatter_output.h
+++ b/libcxx/include/__format/formatter_output.h
@@ -28,7 +28,7 @@
#include <__format/unicode.h>
#include <__iterator/back_insert_iterator.h>
#include <__iterator/concepts.h>
-#include <__iterator/readable_traits.h> // iter_value_t
+#include <__iterator/iterator_traits.h> // iter_value_t
#include <__system_error/errc.h>
#include <__type_traits/make_unsigned.h>
#include <__utility/move.h>
diff --git a/libcxx/include/__format/parser_std_format_spec.h b/libcxx/include/__format/parser_std_format_spec.h
index f3f7bce..35facba 100644
--- a/libcxx/include/__format/parser_std_format_spec.h
+++ b/libcxx/include/__format/parser_std_format_spec.h
@@ -31,7 +31,7 @@
#include <__format/unicode.h>
#include <__format/width_estimation_table.h>
#include <__iterator/concepts.h>
-#include <__iterator/readable_traits.h> // iter_value_t
+#include <__iterator/iterator_traits.h> // iter_value_t
#include <__memory/addressof.h>
#include <__type_traits/common_type.h>
#include <__type_traits/is_trivially_copyable.h>
diff --git a/libcxx/include/__format/unicode.h b/libcxx/include/__format/unicode.h
index c6a124e..f7ff2ab 100644
--- a/libcxx/include/__format/unicode.h
+++ b/libcxx/include/__format/unicode.h
@@ -16,7 +16,7 @@
#include <__config>
#include <__format/extended_grapheme_cluster_table.h>
#include <__iterator/concepts.h>
-#include <__iterator/readable_traits.h> // iter_value_t
+#include <__iterator/iterator_traits.h> // iter_value_t
#include <__type_traits/make_unsigned.h>
#include <__utility/unreachable.h>
#include <string_view>